Daniele Bartolini 10 anni fa
parent
commit
cad3a895a2
3 ha cambiato i file con 5 aggiunte e 11 eliminazioni
  1. 0 6
      src/core/strings/fixed_string.h
  2. 4 4
      src/core/strings/string_id.h
  3. 1 1
      src/lua/lua_stack.h

+ 0 - 6
src/core/strings/fixed_string.h

@@ -38,12 +38,6 @@ public:
 	{
 	}
 
-	FixedString(const FixedString& b)
-		: _length(b._length)
-		, _data(b._data)
-	{
-	}
-
 	FixedString& operator=(const char* str)
 	{
 		_length = strlen32(str);

+ 4 - 4
src/core/strings/string_id.h

@@ -20,11 +20,11 @@ struct StringId32
 	explicit StringId32(u32 idx) : _id(idx) {}
 	explicit StringId32(const char* str);
 	explicit StringId32(const char* str, u32 len);
-	StringId32 operator=(StringId32 a) { _id = a._id; return *this; }
+
 	bool operator==(StringId32 a) const { return _id == a._id; }
 	bool operator!=(StringId32 a) const { return _id != a._id; }
 	bool operator<(StringId32 a) const { return _id < a._id; }
-	u32 id() const { return _id; }
+
 	const char* to_string(char* buf);
 
 	static const u32 STRING_LENGTH = 32;
@@ -41,11 +41,11 @@ struct StringId64
 	explicit StringId64(u64 idx) : _id(idx) {}
 	explicit StringId64(const char* str);
 	explicit StringId64(const char* str, u32 len);
-	StringId64 operator=(StringId64 a) { _id = a._id; return *this; }
+
 	bool operator==(StringId64 a) const { return _id == a._id; }
 	bool operator!=(StringId64 a) const { return _id != a._id; }
 	bool operator<(StringId64 a) const { return _id < a._id; }
-	u64 id() const { return _id; }
+
 	const char* to_string(char* buf);
 
 	static const u32 STRING_LENGTH = 32;

+ 1 - 1
src/lua/lua_stack.h

@@ -352,7 +352,7 @@ public:
 
 	void push_string_id(StringId32 value)
 	{
-		lua_pushnumber(L, value.id());
+		lua_pushnumber(L, value._id);
 	}
 
 	void push_pointer(void* p)