Struct field access must be mindful of alignments.

[cycript.git] / sig / ffi_type.hpp

diff --git a/sig/ffi_type.hpp b/sig/ffi_type.hpp
index a37e6572a4bd29d78f96bc3554acc0fd5729c3eb..fe30373ed0a52369b7c04f0cb361c50852b5d760 100644 (file)
--- a/sig/ffi_type.hpp
+++ b/sig/ffi_type.hpp
@@ -1,63 +1,44 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * 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 SIG_FFI_TYPE_H
 #define SIG_FFI_TYPE_H
 
-#include <apr_pools.h>
-
 #ifdef HAVE_FFI_FFI_H
 #include <ffi/ffi.h>
 #else
 #include <ffi.h>
 #endif
 
+#include "Pooling.hpp"
 #include "sig/types.hpp"
 
 namespace sig {
 
-ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type);
-ffi_type *Java(apr_pool_t *pool, struct Type *type);
+ffi_type *ObjectiveC(CYPool &pool, struct Type *type);
+ffi_type *Java(CYPool &pool, struct Type *type);
 
 void sig_ffi_cif(
-    apr_pool_t *pool,
-    ffi_type *(*sig_ffi_type)(apr_pool_t *, struct Type *),
+    CYPool &pool,
+    ffi_type *(*sig_ffi_type)(CYPool &, struct Type *),
     struct Signature *signature,
     ffi_cif *cif,
     size_t skip = 0,
@@ -65,7 +46,7 @@ void sig_ffi_cif(
     size_t offset = 0
 );
 
-void Copy(apr_pool_t *pool, ffi_type &lhs, ffi_type &rhs);
+void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs);
 
 }