Support full compilation on Mac OS X with clang++.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 84cac4df06f91cc05c42eb030c21e01e79a39b7d..0db5f4230d2296983a7c78f6c455e867ce6269d6 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  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/>.
 **/
 /* }}} */
@@ -246,14 +246,11 @@ void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
 extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) {
     CYLocalPool local;
 
-    CYDriver driver;
-    cy::parser parser(driver);
-
     CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size)));
+    CYStream stream(utf8.data, utf8.data + utf8.size);
+    CYDriver driver(stream);
 
-    driver.data_ = utf8.data;
-    driver.size_ = utf8.size;
-
+    cy::parser parser(driver);
     if (parser.parse() != 0 || !driver.errors_.empty())
         return;