Merge pull request cocos2d#13710 from minggo/implement-function-in-cpp

fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
enhhh · Sep 8, 2015 · d60eb21 · d60eb21
2 parents eab6dbe + bbe5861
commit d60eb21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp
@@ -1096,6 +1096,11 @@ void SIOClient::fireEvent(const std::string& eventName, const std::string& data)
 
     CCLOGINFO("SIOClient::fireEvent no native event with name %s found", eventName.c_str());
 }
+
+void SIOClient::setTag(const char* tag)
+{
+    _tag = tag;
+}
 
 //begin SocketIO methods
 SocketIO *SocketIO::_inst = nullptr;

diff --git a/cocos/network/SocketIO.h b/cocos/network/SocketIO.h
@@ -262,10 +262,8 @@ class CC_DLL SIOClient
      * The tag is used to distinguish the various SIOClient objects.
      * @param tag string object.
      */
-    inline void setTag(const char* tag)
-    {
-        _tag = tag;
-    };
+    void setTag(const char* tag);
+
     /**
      * Get tag of SIOClient.
      * @return const char* the pointer point to the _tag.