Merge branch 'dev' into dev

aminroosta · web-flow · commit 9c5c319d03fb · 2020-02-26T21:11:50.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,20 +6,21 @@ SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set (CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(HUNTER_TLS_VERIFY ON)
 include("cmake/HunterGate.cmake")
 include("cmake/Catch.cmake")
 
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.19.227.tar.gz"
-    SHA1 "808b778a443fcdf19c2d18fea8fa4bb59d16596a"
+    URL "https://github.com/ruslo/hunter/archive/v0.23.214.tar.gz"
+    SHA1 "e14bc153a7f16d6a5eeec845fb0283c8fad8c358"
 )
 
 project(SqliteModernCpp)
 
 hunter_add_package(Catch)
 hunter_add_package(sqlite3)
 
-find_package(Catch CONFIG REQUIRED)
+find_package(Catch2 CONFIG REQUIRED)
 find_package(sqlite3 CONFIG REQUIRED)
 
 set(TEST_SOURCE_DIR             ${CMAKE_SOURCE_DIR}/tests)
@@ -37,9 +38,9 @@ target_include_directories(sqlite_modern_cpp INTERFACE hdr/)
 add_executable(tests_runner ${TEST_SOURCES})
 target_include_directories(tests_runner INTERFACE ${SQLITE3_INCLUDE_DIRS})
 if(ENABLE_SQLCIPHER_TESTS)
-    target_link_libraries(tests_runner Catch::Catch sqlite_modern_cpp sqlite3::sqlite3 -lsqlcipher)
+    target_link_libraries(tests Catch2::Catch2 sqlite_modern_cpp sqlite3::sqlite3 -lsqlcipher)
 else()
-    target_link_libraries(tests_runner Catch::Catch sqlite_modern_cpp sqlite3::sqlite3)
+    target_link_libraries(tests Catch2::Catch2 sqlite_modern_cpp sqlite3::sqlite3)
 endif()
 
 catch_discover_tests(tests_runner)
diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h
@@ -29,7 +29,7 @@ namespace sqlite {
 	template<class T, bool Name = false>
 	struct index_binding_helper {
 		index_binding_helper(const index_binding_helper &) = delete;
-#if __cplusplus < 201703
+#if __cplusplus < 201703 || _MSVC_LANG <= 201703
 		index_binding_helper(index_binding_helper &&) = default;
 #endif
 		typename std::conditional<Name, const char *, int>::type index;
diff --git a/hdr/sqlite_modern_cpp/type_wrapper.h b/hdr/sqlite_modern_cpp/type_wrapper.h
@@ -5,20 +5,20 @@
 #include <memory>
 #include <vector>
 #ifdef __has_include
-#if __cplusplus >= 201703 && __has_include(<string_view>)
+#if (__cplusplus >= 201703 || _MSVC_LANG >= 201703) && __has_include(<string_view>)
 #define MODERN_SQLITE_STRINGVIEW_SUPPORT
 #endif
 #endif
 #ifdef __has_include
-#if __cplusplus > 201402 && __has_include(<optional>)
+#if (__cplusplus > 201402 || _MSCV_LANG > 201402) && __has_include(<optional>)
 #define MODERN_SQLITE_STD_OPTIONAL_SUPPORT
 #elif __has_include(<experimental/optional>) && __apple_build_version__ < 11000000
 #define MODERN_SQLITE_EXPERIMENTAL_OPTIONAL_SUPPORT
 #endif
 #endif
 
 #ifdef __has_include
-#if __cplusplus > 201402 && __has_include(<variant>)
+#if (__cplusplus > 201402 || _MSVC_LANG > 201402) && __has_include(<variant>)
 #define MODERN_SQLITE_STD_VARIANT_SUPPORT
 #endif
 #endif
diff --git a/hdr/sqlite_modern_cpp/utility/utf16_utf8.h b/hdr/sqlite_modern_cpp/utility/utf16_utf8.h
@@ -17,7 +17,7 @@ namespace sqlite {
 			std::size_t produced_output = 0;
 			while(true) {
 				char *used_output;
-				switch(codecvt.out(state, remaining_input, &input[input.size()],
+				switch(codecvt.out(state, remaining_input, input.data() + input.size(),
 				                   remaining_input, &result[produced_output],
 				                   &result[result.size() - 1] + 1, used_output)) {
 				case std::codecvt_base::ok:
@@ -33,7 +33,7 @@ namespace sqlite {
 					produced_output = used_output - result.data();
 					result.resize(
 							result.size()
-							+ (std::max)((&input[input.size()] - remaining_input) * 3 / 2,
+							+ (std::max)((input.data() + input.size() - remaining_input) * 3 / 2,
 							           std::ptrdiff_t(4)));
 				}
 			}
diff --git a/tests/blob_example.cc b/tests/blob_example.cc
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <vector>
 #include <string>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sqlite_modern_cpp.h>
 using namespace  sqlite;
 using namespace std;
diff --git a/tests/error_log.cc b/tests/error_log.cc
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <sqlite_modern_cpp.h>
 #include <sqlite_modern_cpp/log.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/exception_dont_execute.cc b/tests/exception_dont_execute.cc
@@ -3,7 +3,7 @@
 #include <memory>
 #include <stdexcept>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/exception_dont_execute_nested.cc b/tests/exception_dont_execute_nested.cc
@@ -3,7 +3,7 @@
 #include <memory>
 #include <stdexcept>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/exceptions.cc b/tests/exceptions.cc
@@ -4,7 +4,7 @@
 #include <memory>
 #include <stdexcept>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/flags.cc b/tests/flags.cc
@@ -3,7 +3,7 @@
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
 #include <sys/types.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/functions.cc b/tests/functions.cc
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <cmath>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace  sqlite;
 using namespace std;
 
diff --git a/tests/functors.cc b/tests/functors.cc
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <string>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using namespace sqlite;
 using namespace std;
diff --git a/tests/lvalue_functor.cc b/tests/lvalue_functor.cc
@@ -2,7 +2,7 @@
 #include<sqlite_modern_cpp.h>
 #include<string>
 #include<vector>
-#include<catch.hpp>
+#include<catch2/catch.hpp>
 using namespace  sqlite;
 using namespace std;
 
diff --git a/tests/mov_ctor.cc b/tests/mov_ctor.cc
@@ -3,7 +3,7 @@
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
 #include <memory>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace  sqlite;
 using namespace std;
 
diff --git a/tests/named.cc b/tests/named.cc
@@ -1,10 +1,11 @@
 #include <iostream>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
+
 TEST_CASE("binding named parameters works", "[named]") {
     database db(":memory:");
 
@@ -16,4 +17,4 @@ TEST_CASE("binding named parameters works", "[named]") {
     db << "SELECT b FROM foo WHERE a=?;" << 1 >> a;
 
     REQUIRE(a == 2);
-}
+}
diff --git a/tests/nullptr_uniqueptr.cc b/tests/nullptr_uniqueptr.cc
@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace std;
 using namespace sqlite;
 
diff --git a/tests/prepared_statment.cc b/tests/prepared_statment.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace  sqlite;
 using namespace std;
 
diff --git a/tests/readme_example.cc b/tests/readme_example.cc
@@ -1,6 +1,6 @@
 #define CATCH_CONFIG_MAIN
 #include<iostream>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sqlite_modern_cpp.h>
 
 using namespace sqlite;
diff --git a/tests/shared_connection.cc b/tests/shared_connection.cc
@@ -2,7 +2,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using namespace  sqlite;
 using namespace std;
diff --git a/tests/simple_examples.cc b/tests/simple_examples.cc
@@ -2,7 +2,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
diff --git a/tests/std_optional.cc b/tests/std_optional.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using namespace sqlite;
 using namespace std;
diff --git a/tests/string_view.cc b/tests/string_view.cc
@@ -1,5 +1,5 @@
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 #ifdef MODERN_SQLITE_STRINGVIEW_SUPPORT
diff --git a/tests/trycatchblocks.cc b/tests/trycatchblocks.cc
@@ -3,7 +3,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using namespace sqlite;
 using std::string;
diff --git a/tests/variant.cc b/tests/variant.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <sqlite_modern_cpp.h>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 using namespace sqlite;
 using namespace std;
 
