diff options
| author | ljfa-ag <ljfa-ag@web.de> | 2015-06-29 22:26:48 +0200 |
|---|---|---|
| committer | ljfa-ag <ljfa-ag@web.de> | 2015-06-29 22:26:48 +0200 |
| commit | 66b64d57b711dd4b3bf805bc4a325d9448378fe3 (patch) | |
| tree | 6a7792155a994f6e59b9020a3c542ad2189f5bd1 | |
| parent | 69fcbd0fd080aa3e7522040c1abc6394e7a1e390 (diff) | |
| download | Project-Tick-66b64d57b711dd4b3bf805bc4a325d9448378fe3.tar.gz Project-Tick-66b64d57b711dd4b3bf805bc4a325d9448378fe3.zip | |
Remove comparison operators for tag_string
| -rw-r--r-- | include/tag_string.h | 3 | ||||
| -rw-r--r-- | test/nbttest.cpp | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/tag_string.h b/include/tag_string.h index 1daa0c2c6b..964e1532ee 100644 --- a/include/tag_string.h +++ b/include/tag_string.h @@ -36,9 +36,6 @@ public: tag_string(const std::string& str); tag_string(std::string&& str = ""); - bool operator==(const std::string& rhs) const; - bool operator!=(const std::string& rhs) const; - operator std::string&(); operator const std::string&() const; const std::string& get() const; diff --git a/test/nbttest.cpp b/test/nbttest.cpp index 7b47d42f8f..419421f1b8 100644 --- a/test/nbttest.cpp +++ b/test/nbttest.cpp @@ -61,18 +61,18 @@ void test_tag_string() ASSERT(tag.get() == "foo"); std::string& ref = tag; ref = "bar"; - ASSERT(tag == "bar"); - ASSERT(tag != "foo"); + ASSERT(tag.get() == "bar"); + ASSERT(tag.get() != "foo"); tag.set("baz"); ASSERT(ref == "baz"); tag = "quux"; ASSERT("quux" == static_cast<std::string>(tag)); std::string str("foo"); tag = str; - ASSERT(tag == str); + ASSERT(tag.get() == str); - ASSERT(tag_string(str) == "foo"); - ASSERT(tag_string() == ""); + ASSERT(tag_string(str).get() == "foo"); + ASSERT(tag_string().get() == ""); } void test_tag_compound() |
