We no longer need to support the restrict keyword.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index 2ba142197ee3fdf3753e362bc0e824465305244e..87214982edf9f3e763d76200d259102da0a026c9 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,9 +1,31 @@
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+

 #ifndef CYCRIPT_ERROR_HPP
 #define CYCRIPT_ERROR_HPP
 
 #ifndef CYCRIPT_ERROR_HPP
 #define CYCRIPT_ERROR_HPP
 

-#include "Pooling.hpp"

 #include "Exception.hpp"
 #include "Exception.hpp"

+#include "Pooling.hpp"

 
 

+#ifdef CY_EXECUTE

 struct CYJSError :
     CYException
 {
 struct CYJSError :
     CYException
 {


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

-    virtual const char *PoolCString(apr_pool_t *pool) const;
-    virtual JSValueRef CastJSValue(JSContextRef context) const;
+    virtual const char *PoolCString(CYPool &pool) const;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;

 };
 };

+#endif

 
 

-struct CYPoolError :
+struct _visible CYPoolError :

     CYException
 {
     CYPool pool_;
     const char *message_;
 
     CYException
 {
     CYPool pool_;
     const char *message_;
 

+    CYPoolError(const CYPoolError &rhs);
+
+    CYPoolError(const char *message);

     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 JSValueRef CastJSValue(JSContextRef context) const;
+    virtual const char *PoolCString(CYPool &pool) const;
+#ifdef CY_EXECUTE
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;
+#endif

 };
 
 #endif/*CYCRIPT_ERROR_HPP*/
 };
 
 #endif/*CYCRIPT_ERROR_HPP*/