Replace iconv with some code from "official" code.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index 9a04659d42c57abc0e3427fe68d636fdd152adc2..3165287a1d782ce5e7d2ceb5bd242d0441ecf64f 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -40,7 +40,7 @@ struct CYJSError :
 
     CYJSError(JSContextRef context, const char *format, ...);
 
 
     CYJSError(JSContextRef context, const char *format, ...);
 

-    virtual const char *PoolCString(apr_pool_t *pool) const;
+    virtual const char *PoolCString(CYPool &pool) const;

     virtual JSValueRef CastJSValue(JSContextRef context) const;
 };
 #endif
     virtual JSValueRef CastJSValue(JSContextRef context) const;
 };
 #endif


@@ -51,10 +51,12 @@ struct CYPoolError :
     CYPool pool_;
     const char *message_;
 
     CYPool pool_;
     const char *message_;
 

+    CYPoolError(const CYPoolError &rhs);
+

     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 
     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 

-    virtual const char *PoolCString(apr_pool_t *pool) const;
+    virtual const char *PoolCString(CYPool &pool) const;

 #ifdef CY_EXECUTE
     virtual JSValueRef CastJSValue(JSContextRef context) const;
 #endif
 #ifdef CY_EXECUTE
     virtual JSValueRef CastJSValue(JSContextRef context) const;
 #endif