Changeset 371 for cpp/frams/vm

Timestamp:

04/21/15 15:19:47 (9 years ago)

Author:

Maciej Komosinski

Message:

THREAD_LOCAL uses ThreadLocal_ prefix for variables. The static object inside the single-threaded implementation is no longer associated with a class.

File:

• cpp/frams/vm/classes/collectionobj.cpp (modified) (5 diffs)

cpp/frams/vm/classes/collectionobj.cpp

@@ -149 +149 @@
 }
 
-static THREAD_LOCAL_DEF(SList,tostring_trace);
+static THREAD_LOCAL_DEF(SList,VectorObject_tostring_trace);
 
 void VectorObject::get_toString(ExtValue* ret)
@@ -155 +155 @@
 SString out="[";
 //static SListTempl<VectorObject*> trace;
-if (tlsGetRef(tostring_trace).find(this)>=0)
+if (tlsGetRef(VectorObject_tostring_trace).find(this)>=0)
         out+="...";
 else
         {
-        tlsGetRef(tostring_trace)+=this;
+        tlsGetRef(VectorObject_tostring_trace)+=this;
         for(int i=0;i<data.size();i++)
                 {
@@ -169 +169 @@
                         out+="null";
                 }
-        tlsGetRef(tostring_trace)-=this;
+        tlsGetRef(VectorObject_tostring_trace)-=this;
         }
 out+="]";
@@ -402 +402 @@
 SString out="{";
 //static SListTempl<DictionaryObject*> trace;
-if (tlsGetRef(tostring_trace).find(this)>=0)
+if (tlsGetRef(VectorObject_tostring_trace).find(this)>=0)
         out+="...";
 else
         {
-        tlsGetRef(tostring_trace)+=this;
+        tlsGetRef(VectorObject_tostring_trace)+=this;
         for(HashEntryIterator it(hash);it.isValid();)
                 {
@@ -418 +418 @@
                 if (it.isValid()) out+=",";
                 }
-        tlsGetRef(tostring_trace)-=this;
+        tlsGetRef(VectorObject_tostring_trace)-=this;
         }
 out+="}";