Vutils

vic4key · Oct 30, 2023 · 46707ac · 46707ac
1 parent cc0b5e2
commit 46707ac
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/Test/Sample.RESTClient.h b/Test/Sample.RESTClient.h
@@ -23,7 +23,7 @@ DEF_SAMPLE(RESTClient)
   std::cout << response.text << std::endl;
 
   // create one
-  rest_client.post(ts("/api/v1/customers"), response, R"({"name":"name 5","phone":"phone 5"})", header);
+  rest_client.post(ts("/api/v1/customers"), response, "{\"name\":\"name 5\",\"phone\":\"phone 5\"}", header);
   std::cout << vu::decode_const_http_status_A(response.status) << std::endl;
   std::cout << response.text << std::endl;
 
@@ -33,7 +33,7 @@ DEF_SAMPLE(RESTClient)
   std::cout << response.text << std::endl;
 
   // update one
-  rest_client.put(ts("/api/v1/customers/5"), response, R"({"name":"name 5-x","phone":"phone 5-x"})", header);
+  rest_client.put(ts("/api/v1/customers/5"), response, "{\"name\":\"name 5-x\",\"phone\":\"phone 5-x\"}", header);
   std::cout << vu::decode_const_http_status_A(response.status) << std::endl;
   std::cout << response.text << std::endl;
 

diff --git a/Test/Sample.String.h b/Test/Sample.String.h
@@ -92,7 +92,13 @@ DEF_SAMPLE(String)
     }
   }
 
-  std::vector<std::tstring> strings = { ts("ape"), ts("apple"), ts("peach"), ts("puppy") };
+  std::vector<std::tstring> strings;
+  {
+    strings.push_back(ts("ape"));
+    strings.push_back(ts("apple"));
+    strings.push_back(ts("peach"));
+    strings.push_back(ts("puppy"));
+  }
   auto closest_string = vu::find_closest_string(ts("aple"), strings);
   assert(closest_string == ts("apple"));
 

diff --git a/include/Vutils.h b/include/Vutils.h
@@ -3296,12 +3296,13 @@ class ThreadPool
  * Scoped_<handle>
  */
 
-#if defined(_MSC_VER)
+// C++14 (MSVC 2015+ or MinGW 5.1+)
+#if (defined(_MSC_VER) && _MSC_VER >= 1900) || (defined(__MINGW32__) && __cplusplus >= 201402L)
 #include "template/handle.tpl"
 ScopedHandleT_Define(HANDLE, HANDLE, INVALID_HANDLE_VALUE, { CloseHandle(h); });
 ScopedHandleT_Define(NULL_HANDLE, HANDLE, nullptr, { CloseHandle(h); });
 ScopedHandleT_Define(FILE, FILE*, nullptr, { fclose(h); });
-#endif // _MSC_VER
+#endif
 
 /**
  * Path

diff --git a/include/template/singleton.tpl b/include/template/singleton.tpl
@@ -26,10 +26,13 @@ public:
     }
   }
 
+  // C++14 (MSVC 2013+ or MinGW 4.6+)
+  #if (defined(_MSC_VER) && _MSC_VER >= 1800) || (defined(__MINGW32__) && __cplusplus >= 201103L)
   SingletonT(SingletonT&&) = delete;
   SingletonT(SingletonT const&) = delete;
   SingletonT& operator=(SingletonT&&) = delete;
   SingletonT& operator=(SingletonT const&) = delete;
+  #endif
 
   static T& instance()
   {

diff --git a/src/details/strfmt.cpp b/src/details/strfmt.cpp
@@ -771,7 +771,7 @@ std::unique_ptr<byte[]> VariantT<T>::to_bytes() const
   }
 
   std::unique_ptr<byte[]> result(new byte[bytes.size()]);
-  std::move(bytes.cbegin(), bytes.cend(), result.get());
+  for (size_t i = 0; i < bytes.size(); i++) result.get()[i] = bytes[i]; // std::move(bytes.cbegin(), bytes.cend(), result.get());
   return result;
 }