From d1becf79913ff0ea304590cc1691389b20d6dfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 1 Sep 2022 22:00:16 -0700 Subject: [PATCH] Cleanup. --- include/bx/inline/string.inl | 27 --------------------------- include/bx/string.h | 17 ----------------- tests/string_test.cpp | 2 +- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/include/bx/inline/string.inl b/include/bx/inline/string.inl index c1e796d..b622142 100644 --- a/include/bx/inline/string.inl +++ b/include/bx/inline/string.inl @@ -75,21 +75,11 @@ namespace bx return *this; } - inline StringView::StringView(char* _ptr) - { - set(_ptr, INT32_MAX); - } - inline StringView::StringView(const char* _ptr) { set(_ptr, INT32_MAX); } - inline StringView::StringView(char* _ptr, int32_t _len) - { - set(_ptr, _len); - } - inline StringView::StringView(const char* _ptr, int32_t _len) { set(_ptr, _len); @@ -100,17 +90,6 @@ namespace bx set(_ptr, _term); } - template - inline StringView::StringView(const Ty& _container) - { - set(_container); - } - - inline void StringView::set(char* _ptr) - { - set(_ptr, INT32_MAX); - } - inline void StringView::set(const char* _ptr) { set(_ptr, INT32_MAX); @@ -133,12 +112,6 @@ namespace bx set(_ptr, int32_t(_term-_ptr) ); } - template - inline void StringView::set(const Ty& _container) - { - set(_container.data(), int32_t(_container.length() ) ); - } - inline void StringView::set(const StringView& _str, int32_t _start, int32_t _len) { const int32_t start = min(_start, _str.m_len); diff --git a/include/bx/string.h b/include/bx/string.h index d474dcf..3fd2a22 100644 --- a/include/bx/string.h +++ b/include/bx/string.h @@ -37,28 +37,15 @@ namespace bx /// StringView& operator=(const StringView& _rhs); - /// - StringView(char* _ptr); - /// StringView(const char* _ptr); - /// - StringView(char* _ptr, int32_t _len); - /// StringView(const char* _ptr, int32_t _len); /// StringView(const char* _ptr, const char* _term); - /// - template - explicit StringView(const Ty& _container); - - /// - void set(char* _ptr); - /// void set(const char* _ptr); @@ -71,10 +58,6 @@ namespace bx /// void set(const StringView& _str, int32_t _start = 0, int32_t _len = INT32_MAX); - /// - template - void set(const Ty& _container); - /// void clear(); diff --git a/tests/string_test.cpp b/tests/string_test.cpp index db8ac0f..cbcb50e 100644 --- a/tests/string_test.cpp +++ b/tests/string_test.cpp @@ -16,7 +16,7 @@ TEST_CASE("stringPrintfTy", "") { std::string test; bx::stringPrintf(test, "printf into std::string."); - REQUIRE(0 == bx::strCmp(bx::StringView(test), "printf into std::string.") ); + REQUIRE(0 == bx::strCmp(bx::StringView(test.data(), int32_t(test.length() ) ), "printf into std::string.") ); } TEST_CASE("prettify", "")