bug fix..

test with c++14?

Author: vztpv

claujson.cpp

@@ -9,10 +9,34 @@
 
 #include "fmt/format.h"
 
+#if __cpp_lib_string_view
+
+#else
+
+	claujson::StringView operator""sv(const char* str, size_t sz) {
+		return claujson::StringView(str, sz);
+	}
+
+	bool operator==(const std::string& str, claujson::StringView sv) {
+		return claujson::StringView(str.data(), str.size()) == sv;
+	}
+
+#endif
+
 namespace claujson {
 	// todo? make Document class? like simdjson?
 	_Value _Value::empty_value{ nullptr, false }; // valid is false..
 	const uint64_t _Value::npos = -1; // 
+#if __cpp_lib_string_view
+
+#else
+	const uint64_t StringView::npos = -1;
+#endif
+
+	Log::Info info;
+	Log::Warning warn;
+
+
 
 	const uint64_t StructuredPtr::npos = -1;
 	_Value StructuredPtr::empty_value{ nullptr, false };

claujson.h

@@ -590,20 +590,6 @@ namespace claujson {
 		/* error.make(__LINE__, StringView(msg)); */ \
 	} while (false) 
 
-#if __cpp_lib_string_view
-#else
-
-claujson::StringView operator""sv(const char* str, size_t sz) {
-	return claujson::StringView(str, sz);
-}
-
-uint64_t claujson::StringView::npos = -1;
-
-bool operator==(const std::string& str, claujson::StringView sv) {
-	return strcmp(str.data(), sv.data()) == 0;
-}
-
-#endif
 namespace claujson {
 	claujson::_Value& Convert(claujson::_Value& data, uint64_t buf_idx, uint64_t next_buf_idx, bool key,
 			char* buf, uint64_t token_idx, bool& err);

claujson_internal.h

@@ -94,7 +94,7 @@ namespace claujson {
 		const char* m_str;
 		size_t m_len;
 	public:
-		static uint64_t npos;
+		static const uint64_t npos;
 
 		friend std::ostream& operator<<(std::ostream& stream, const claujson::StringView& sv) {
 			stream << sv.data();
@@ -135,11 +135,11 @@ namespace claujson {
 	};
 }
 
-
 claujson::StringView operator""sv(const char* str, size_t sz);
 bool operator==(const std::string& str, claujson::StringView sv);
 
 
+
 #endif
 
 
@@ -482,8 +482,8 @@ namespace claujson {
 		return log;
 	}
 
-	static Log::Info info;
-	static Log::Warning warn;
+	extern Log::Info info;
+	extern Log::Warning warn;
 	extern Log log; // no static..
 	// inline Error error;
 

main.cpp

@@ -3,7 +3,7 @@
 // need C++14~, 64bit..
 // mainly tested with C++17...
 
-#include "mimalloc-new-delete.h"
+//#include "mimalloc-new-delete.h"
 
 #include <iostream>
 #include <string>
@@ -314,7 +314,9 @@ int main(int argc, char* argv[])
 				auto b = std::chrono::steady_clock::now();
 				auto dur = std::chrono::duration_cast<std::chrono::milliseconds>(b - a);
 				std::cout << "total " << dur.count() << "ms\n";
-			//	continue;
+				return 0;
+				
+				//	continue;
 				auto c = std::chrono::steady_clock::now();
 				{
 					auto z = j.Get().clone();