Rename RegisterClass to _hx_RegisterClass to avoid issues with microsoft

HaxeFoundation · Apr 25, 2016 · a66838a · a66838a
1 parent a06286b
commit a66838a
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 21 deletions.
diff --git a/include/hx/Class.h b/include/hx/Class.h
@@ -202,8 +202,9 @@ void __hxcpp_boot_std_classes();
 namespace hx
 {
 
+
 HXCPP_EXTERN_CLASS_ATTRIBUTES
-hx::Class RegisterClass(const String &inClassName, CanCastFunc inCanCast,
+hx::Class _hx_RegisterClass(const String &inClassName, CanCastFunc inCanCast,
                     String inStatics[], String inMembers[],
                     ConstructEmptyFunc inConstructEmpty, ConstructArgsFunc inConstructArgs,
                     hx::Class *inSuperClass, ConstructEnumFunc inConst=0, MarkFunc inMarkFunc=0
@@ -216,8 +217,40 @@ hx::Class RegisterClass(const String &inClassName, CanCastFunc inCanCast,
                     #endif
                     );
 
+// For older versions
+inline hx::Class RegisterClass(
+                    const String &inClassName, CanCastFunc inCanCast,
+                    String inStatics[], String inMembers[],
+                    ConstructEmptyFunc inConstructEmpty, ConstructArgsFunc inConstructArgs,
+                    hx::Class *inSuperClass, ConstructEnumFunc inConst=0, MarkFunc inMarkFunc=0
+                    #ifdef HXCPP_VISIT_ALLOCS
+                    , VisitFunc inVisitFunc=0
+                    #endif
+                    #ifdef HXCPP_SCRIPTABLE
+                    ,const hx::StorageInfo *inStorageInfo=0
+                    ,const hx::StaticInfo *inStaticInfo=0
+                    #endif
+                    )
+{
+   return _hx_RegisterClass(inClassName, inCanCast, inStatics, inMembers,
+                    inConstructEmpty, inConstructArgs, inSuperClass, inConst, inMarkFunc
+                    #ifdef HXCPP_VISIT_ALLOCS
+                    , inVisitFunc
+                    #endif
+                    #ifdef HXCPP_SCRIPTABLE
+                    ,inStorageInfo ,inStaticInfo
+                    #endif
+                    );
+}
+
+
 HXCPP_EXTERN_CLASS_ATTRIBUTES
-void RegisterClass(const String &inClassName, hx::Class inClass);
+void _hx_RegisterClass(const String &inClassName, hx::Class inClass);
+
+inline void RegisterClass(const String &inClassName, hx::Class inClass)
+{
+   _hx_RegisterClass(inClassName, inClass);
+}
 
 template<typename T>
 inline bool TCanCast(hx::Object *inPtr)

diff --git a/src/Array.cpp b/src/Array.cpp
@@ -563,7 +563,7 @@ static bool ArrayCanCast(hx::Object *inInstance)
 
 void ArrayBase::__boot()
 {
-   Static(__mClass) = hx::RegisterClass(HX_CSTRING("Array"),ArrayCanCast,sNone,sArrayFields,
+   Static(__mClass) = hx::_hx_RegisterClass(HX_CSTRING("Array"),ArrayCanCast,sNone,sArrayFields,
                                     ArrayCreateEmpty,ArrayCreateArgs,0,0);
 }
 

diff --git a/src/Dynamic.cpp b/src/Dynamic.cpp
@@ -569,21 +569,21 @@ static void sVisitStatics(HX_VISIT_PARAMS) {
 
 void Dynamic::__boot()
 {
-   Static(__VoidClass) = hx::RegisterClass(HX_CSTRING("Void"),NoCast,sNone,sNone,0,0,0, 0, sMarkStatics
+   Static(__VoidClass) = hx::_hx_RegisterClass(HX_CSTRING("Void"),NoCast,sNone,sNone,0,0,0, 0, sMarkStatics
       #ifdef HXCPP_VISIT_ALLOCS
       ,sVisitStatics
       #endif
    );
-   Static(__BoolClass) = hx::RegisterClass(HX_CSTRING("Bool"),TCanCast<BoolData>,sNone,sNone, 0,0, 0);
-   Static(__IntClass) = hx::RegisterClass(HX_CSTRING("Int"),IsInt,sNone,sNone,0,0, 0 );
-   Static(__FloatClass) = hx::RegisterClass(HX_CSTRING("Float"),IsFloat,sNone,sNone, 0,0,&__IntClass );
-   Static(__Int64Class) = hx::RegisterClass(HX_CSTRING("cpp::Int64"),IsInt64,sNone,sNone, 0,0,&__IntClass );
-   Static(__PointerClass) = hx::RegisterClass(HX_CSTRING("cpp::Pointer"),IsPointer,sNone,sNone, 0,0,&__PointerClass );
+   Static(__BoolClass) = hx::_hx_RegisterClass(HX_CSTRING("Bool"),TCanCast<BoolData>,sNone,sNone, 0,0, 0);
+   Static(__IntClass) = hx::_hx_RegisterClass(HX_CSTRING("Int"),IsInt,sNone,sNone,0,0, 0 );
+   Static(__FloatClass) = hx::_hx_RegisterClass(HX_CSTRING("Float"),IsFloat,sNone,sNone, 0,0,&__IntClass );
+   Static(__Int64Class) = hx::_hx_RegisterClass(HX_CSTRING("cpp::Int64"),IsInt64,sNone,sNone, 0,0,&__IntClass );
+   Static(__PointerClass) = hx::_hx_RegisterClass(HX_CSTRING("cpp::Pointer"),IsPointer,sNone,sNone, 0,0,&__PointerClass );
    DynTrue = Dynamic( new (hx::NewObjConst) hx::BoolData(true) );
    DynFalse = Dynamic( new (hx::NewObjConst) hx::BoolData(false) );
    DynEmptyString = Dynamic(HX_CSTRING("").__ToObject());
 #ifdef HXCPP_OBJC
-   Static(__ObjcClass) = hx::RegisterClass(HX_CSTRING("objc::BoxedType"),IsPointer,sNone,sNone, 0,0,&__ObjcClass );
+   Static(__ObjcClass) = hx::_hx_RegisterClass(HX_CSTRING("objc::BoxedType"),IsPointer,sNone,sNone, 0,0,&__ObjcClass );
 #endif
 }
 

diff --git a/src/Enum.cpp b/src/Enum.cpp
@@ -29,7 +29,7 @@ hx::Class &EnumBase_obj::__SGetClass() { return hxEnumBase_obj__mClass; }
 
 void EnumBase_obj::__boot()
 {
-   Static(hxEnumBase_obj__mClass) = hx::RegisterClass(HX_CSTRING("__EnumBase") ,TCanCast<EnumBase_obj>,
+   Static(hxEnumBase_obj__mClass) = hx::_hx_RegisterClass(HX_CSTRING("__EnumBase") ,TCanCast<EnumBase_obj>,
                        sNone,sNone,
                        &__CreateEmpty, &__Create, 0 );
 }

diff --git a/src/Math.cpp b/src/Math.cpp
@@ -145,7 +145,7 @@ static hx::StaticInfo Math_obj_sStaticStorageInfo[] = {
 
 void Math_obj::__boot()
 {
-   Static(Math_obj::__mClass) = hx::RegisterClass(HX_CSTRING("Math"),TCanCast<Math_obj>,sMathFields,sNone, &__CreateEmpty,0 , 0 );
+   Static(Math_obj::__mClass) = hx::_hx_RegisterClass(HX_CSTRING("Math"),TCanCast<Math_obj>,sMathFields,sNone, &__CreateEmpty,0 , 0 );
 
 #ifdef HXCPP_SCRIPTABLE
    Math_obj::__mClass->mStaticStorageInfo = Math_obj_sStaticStorageInfo;

diff --git a/src/String.cpp b/src/String.cpp
@@ -1348,7 +1348,7 @@ hx::Object *String::__ToObject() const
 
 void String::__boot()
 {
-   Static(__StringClass) = hx::RegisterClass(HX_CSTRING("String"),TCanCast<StringData>,sStringStatics, sStringFields,
+   Static(__StringClass) = hx::_hx_RegisterClass(HX_CSTRING("String"),TCanCast<StringData>,sStringStatics, sStringFields,
            &CreateEmptyString, &CreateString, 0, 0, 0
     );
 }

diff --git a/src/hx/Anon.cpp b/src/hx/Anon.cpp
@@ -322,7 +322,7 @@ hx::Class Anon_obj::__mClass;
 
 void Anon_obj::__boot()
 {
-   Static(__mClass) = hx::RegisterClass(HX_CSTRING("__Anon"),TCanCast<Anon_obj>,sNone,sNone,0,0,0,0);
+   Static(__mClass) = hx::_hx_RegisterClass(HX_CSTRING("__Anon"),TCanCast<Anon_obj>,sNone,sNone,0,0,0,0);
 }
 
 

diff --git a/src/hx/Class.cpp b/src/hx/Class.cpp
@@ -12,7 +12,7 @@ namespace hx
 typedef std::map<String,Class> ClassMap;
 static ClassMap *sClassMap = 0;
 
-Class RegisterClass(const String &inClassName, CanCastFunc inCanCast,
+Class _hx_RegisterClass(const String &inClassName, CanCastFunc inCanCast,
                     String inStatics[], String inMembers[],
                     ConstructEmptyFunc inConstructEmpty, ConstructArgsFunc inConstructArgs,
                     Class *inSuperClass, ConstructEnumFunc inConstructEnum,
@@ -45,7 +45,7 @@ Class RegisterClass(const String &inClassName, CanCastFunc inCanCast,
    return c;
 }
 
-void RegisterClass(const String &inClassName, Class inClass)
+void _hx_RegisterClass(const String &inClassName, Class inClass)
 {
    if (sClassMap==0)
       sClassMap = new ClassMap;
@@ -152,7 +152,7 @@ Class &Class_obj::__SGetClass() { return Class_obj__mClass; }
 
 void Class_obj::__boot()
 {
-Static(Class_obj__mClass) = hx::RegisterClass(HX_CSTRING("Class"),TCanCast<Class_obj>,sNone,sNone, 0,0 , 0, 0 );
+Static(Class_obj__mClass) = hx::_hx_RegisterClass(HX_CSTRING("Class"),TCanCast<Class_obj>,sNone,sNone, 0,0 , 0, 0 );
 }
 
 

diff --git a/src/hx/Object.cpp b/src/hx/Object.cpp
@@ -130,7 +130,7 @@ static hx::ScriptNamedFunction __scriptableFunctions[] = {
 
 void Object::__boot()
 {
-   Static(Object__mClass) = hx::RegisterClass(HX_CSTRING("Dynamic"),AlwaysCast,sNone,sNone,0,0, 0, 0 );
+   Static(Object__mClass) = hx::_hx_RegisterClass(HX_CSTRING("Dynamic"),AlwaysCast,sNone,sNone,0,0, 0, 0 );
 
    #ifdef HXCPP_SCRIPTABLE
    hx::ScriptableRegisterClass( HX_CSTRING("hx.Object"), (int)sizeof(hx::Object__scriptable), __scriptableFunctions, Object__scriptable::__script_create, Object::__script_construct );

diff --git a/src/hx/Scriptable.cpp b/src/hx/Scriptable.cpp
@@ -538,7 +538,7 @@ class ScriptHandler : public hx::Class_obj
 
       DBGLOG("Class %s, base %p\n", (mName + HX_CSTRING("::") + superName).__s, mScriptBase );
 
-      RegisterClass(RemapFlash(mName), (hx::Class_obj *)this);
+      _hx_RegisterClass(RemapFlash(mName), (hx::Class_obj *)this);
 
       mScript = mScriptBase;
       (*sScriptRegistered)[mName.__s] = mScript;
@@ -1338,7 +1338,7 @@ void InitABC()
    String *__scriptableFunctionNames = &allFunctions;
 
 
-   RegisterClass(HX_CSTRING("Object"), new ScriptHandler());
+   _hx_RegisterClass(HX_CSTRING("Object"), new ScriptHandler());
    HX_SCRIPTABLE_REGISTER_CLASS("Object",Object_obj);
    sObject = (*sScriptRegistered)["Object"];
 
@@ -1497,7 +1497,7 @@ void LoadABC(const unsigned char *inBytes, int inLen)
          if (cls==null())
          {
             ABCClass cls = new ABCClass_obj(abc, inst, abc.mClassInfo[i]);
-            RegisterClass(className,cls);
+            _hx_RegisterClass(className,cls);
          }
          else
          {
-Original file line number
+Diff line change
@@ Expand Up / @@ -322,7 +322,7 @@ hx::Class Anon_obj::__mClass; @@
     void Anon_obj::__boot()
     {
-       Static(__mClass) = hx::RegisterClass(HX_CSTRING("__Anon"),TCanCast<Anon_obj>,sNone,sNone,0,0,0,0);
+       Static(__mClass) = hx::_hx_RegisterClass(HX_CSTRING("__Anon"),TCanCast<Anon_obj>,sNone,sNone,0,0,0,0);
     }
@@ Expand Down @@