Revert "Refactor a bit xr_token"

This reverts commit 2039fc6.
OpenXRay · Nov 15, 2017 · 028188f · 028188f
1 parent 9c218b4
commit 028188f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/xrCommon/xr_string.h b/src/xrCommon/xr_string.h
@@ -3,7 +3,7 @@
 #include "xalloc.h"
 
 // string(char)
-using xr_string = std::basic_string<char, std::char_traits<char>, xalloc<char>>;
+typedef std::basic_string<char, std::char_traits<char>, xalloc<char>> xr_string;
 
 inline void xr_strlwr(xr_string& src)
 {

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -96,20 +96,17 @@
 // stl ext
 struct XRCORE_API xr_rtoken
 {
-    xr_string name;
+    shared_str name;
     int id;
 
-    xr_rtoken(const pcstr _nm, const int _id)
+    xr_rtoken(pcstr _nm, int _id)
     {
         name = _nm;
         id = _id;
     }
 
-    void rename(const pcstr _nm) { name = _nm; }
-    bool equal(const pcstr _nm) const
-    {
-        return name.compare(_nm) == 0;
-    }
+    void rename(pcstr _nm) { name = _nm; }
+    bool equal(pcstr _nm) const { return (0 == xr_strcmp(*name, _nm)); }
 };
 
 #pragma pack(push, 1)