Add -Wno-dangling-else, required by clang++ -Wall.

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index c9076624e445abdf8d79dde80084b477bf7283cf..a8c1fd929b72f0a379aaa70bb712749acb88cd3c 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -1,49 +1,32 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU 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:
+ * 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.
  *
- * 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.
+ * 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.
  *
- * 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.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
-#ifndef CYPOOLING_HPP
-#define CYPOOLING_HPP
+#ifndef CYCRIPT_POOLING_HPP
+#define CYCRIPT_POOLING_HPP
 
 #include <apr_pools.h>
 #include <apr_strings.h>
 
 #include "Exception.hpp"
+#include "Local.hpp"
 #include "Standard.hpp"
 
 #include <cstdlib>
@@ -61,8 +44,8 @@ class CYPool {
     apr_pool_t *pool_;
 
   public:
-    CYPool() {
-        _aprcall(apr_pool_create(&pool_, NULL));
+    CYPool(apr_pool_t *pool = NULL) {
+        _aprcall(apr_pool_create(&pool_, pool));
     }
 
     ~CYPool() {
@@ -88,6 +71,12 @@ class CYPool {
 
 struct CYData {
     apr_pool_t *pool_;
+    unsigned count_;
+
+    CYData() :
+        count_(1)
+    {
+    }
 
     virtual ~CYData() {
     }
@@ -107,7 +96,6 @@ struct CYData {
     static void operator delete(void *data) {
         apr_pool_destroy(reinterpret_cast<CYData *>(data)->pool_);
     }
-
 };
 
 template <typename Type_>
@@ -164,4 +152,21 @@ struct CYPoolAllocator {
     };
 };
 
-#endif/*CYPOOLING_HPP*/
+class CYLocalPool :
+    public CYPool
+{
+  private:
+    CYLocal<apr_pool_t> local_;
+
+  public:
+    CYLocalPool() :
+        CYPool(),
+        local_(operator apr_pool_t *())
+    {
+    }
+};
+
+#define $pool \
+    CYLocal<apr_pool_t>::Get()
+
+#endif/*CYCRIPT_POOLING_HPP*/