jxcore · obastemur · Jan 25, 2016 · Jan 25, 2016
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,9 @@ out_v8/
 out_ios/
 out_android/
 
+.pbxproj/
+*.xcodeproj/
+
 # various stuff that VC++ produces/uses
 Debug/
 Release/

diff --git a/src/jx/Proxy/Mozilla_340/MozJS/MozValue.cc b/src/jx/Proxy/Mozilla_340/MozJS/MozValue.cc
@@ -59,7 +59,7 @@ void StringTools::JS_ConvertToJSChar(JSContext *cx, const char *source,
     out->str_[out->length_] = char16_t(0);
   } else {
     // force ascii to char16_t
-    for (int i = 0; i < sz_source; i++) {
+    for (unsigned i = 0; i < sz_source; i++) {
       char buffer[2] = {source[i], 0};
       char16_t *ref = (char16_t *)buffer;
       out->str_[i] = *ref;
@@ -566,11 +566,11 @@ void Value::RemoveRoot() {
   } else {                                        \
     JS::RootedValue rv(ctx_, value_);             \
     JS_ValueToObject(ctx_, rv, &name##rt);        \
-  }                                               \
-  JSObject *name = name##rt
+  }
 
 void Value::SetPrivate(void *data) {
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   assert(object_ != nullptr &&
          "Can not set private data into none object JS variable");
@@ -589,6 +589,7 @@ void Value::SetPrivate(void *data) {
 
 void *Value::GetPointerFromInternalField(const int index) {
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   JS::RootedObject ret_val(ctx_);
   if (object_ != nullptr) {
@@ -766,6 +767,7 @@ void Value::SetIndexedPropertiesToExternalArrayData(void *data,
                                                     const int data_type,
                                                     const int32_t length) {
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   assert(object_ != nullptr);
 
@@ -869,6 +871,7 @@ bool Value::HasBufferSignature() const {
 bool Value::HasInstance(const Value &val) {
   if (!val.IsObject() || value_.isNullOrUndefined()) return false;
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   JS::RootedValue rv_val(ctx_, val.value_);
   JS::RootedObject rv_obj(ctx_);
@@ -1114,6 +1117,7 @@ void Value::Natify(JS::HandleObject object_rt, const bool force_create,
 void Value::SetFinalizer(JS_FINALIZER_METHOD method) {
   if (!value_.isObject()) return;
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   JS::RootedObject ret_val(ctx_);
   if (!JS_HasReservedSlot(object_, GC_SLOT_GC_CALL)) {
@@ -1213,6 +1217,7 @@ void Value::SetReserved(const int index, const Value &value) {
   assert(index <= JS_OBJECT_SLOT_MAX_INDEX);
 
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   JS::RootedObject ret_val(ctx_);
   if (object_ != nullptr) {
@@ -1233,6 +1238,7 @@ Value Value::GetReserved(const int index) {
   assert(index <= JS_OBJECT_SLOT_MAX_INDEX);
 
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   JS::RootedObject ret_val(ctx_);
   if (object_ == nullptr) {
@@ -1318,6 +1324,7 @@ Value Value::GetIndex(const int index) {
   val.empty_ = false;
 
   INNER_VALUE_TO_OBJECT(object_, false);
+  JSObject *object_ = object_rt;
 
   if (object_ == nullptr) return Value();
 

diff --git a/src/jx/Proxy/Mozilla_340/MozJS/utf_man.cc b/src/jx/Proxy/Mozilla_340/MozJS/utf_man.cc
@@ -54,18 +54,18 @@ uint32_t Utf8ToOneUcs4Char(const uint8_t *utf8Buffer, int utf8Length) {
   return ucs4Char;
 }
 
-#ifdef DEBUG
 #define ReportInvalidCharacter 1
 #define ReportBufferTooSmall 2
 #define ReportTooBigCharacter 2
 
+#ifdef DEBUG
 #define INVALID(report, arg, n2)                                     \
   do {                                                               \
     if (report == 2)                                                 \
       flush_console(                                                 \
           "Error while converting UTF8 (Please report this at "      \
           "https://github.com/jxcore/jxcore) - Err: %s\n",           \
-          ##report);                                                 \
+          #report);                                                  \
     else                                                             \
       flush_console("!! Invalid Character while converting UTF8\n"); \
     dst[j] = jschar(REPLACE_UTF8);                                   \

diff --git a/src/jxcore.cc b/src/jxcore.cc
@@ -573,7 +573,6 @@ void JXEngine::InitializeEngine(int argc, char **argv) {
   }
 
   JSContext *ctx = main_iso_.GetRaw();
-  JSRuntime *rt = JS_GetRuntime(ctx);
   do {
     Init(argc, argv_copy, was_inited);
     do {
@@ -869,7 +868,6 @@ void JXEngine::InitializeEmbeddedEngine(int argc, char **argv) {
   }
 
   JSContext *ctx = main_iso_.GetRaw();
-  JSRuntime *rt = JS_GetRuntime(ctx);
 
   Init(argc, argv_copy, was_inited);
 
@@ -955,7 +953,6 @@ void JXEngine::Destroy() {
         main_node_->free_context_list_.begin();
 
     while (itc != main_node_->free_context_list_.end()) {
-      JSContext *ctx_sub = *itc;
       JS_DestroyContext(*itc);
       itc++;
     }

diff --git a/src/wrappers/jxtimers_wrap.cc b/src/wrappers/jxtimers_wrap.cc
@@ -66,7 +66,6 @@ void JXTimersWrap::checkKeys() {
 
 void JXTimersWrap::Watcher(void *w) {
   int timer = 25;
-  bool follow = false;
   int counter = 0;
   while (true) {
     commons::CheckMemoryLimit();

diff --git a/src/wrappers/memory_wrap.cc b/src/wrappers/memory_wrap.cc
@@ -417,7 +417,6 @@ JS_METHOD(MemoryWrap, SourceSet) {
   jxcore::JXString str_key;
   args.GetString(0, &str_key);
 
-  MAP_HOST_DATA data;
   if (!args.IsString(1)) {
     JS_LOCAL_OBJECT obj = JS_VALUE_TO_OBJECT(args.GetItem(1));
     SharedSet(*str_key, BUFFER__DATA(obj), BUFFER__LENGTH(obj));