44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
|
|
index a8503bb..11362cf 100644
|
|
--- a/runtime/Cpp/runtime/CMakeLists.txt
|
|
+++ b/runtime/Cpp/runtime/CMakeLists.txt
|
|
@@ -5,8 +5,8 @@ set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
|
|
set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
|
|
ExternalProject_Add(
|
|
utfcpp
|
|
- GIT_REPOSITORY "git://github.com/nemtrif/utfcpp"
|
|
- GIT_TAG "v3.1.1"
|
|
+ GIT_REPOSITORY "https://github.com/nemtrif/utfcpp"
|
|
+ GIT_TAG "v3.2.1"
|
|
SOURCE_DIR ${UTFCPP_DIR}
|
|
UPDATE_DISCONNECTED 1
|
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
|
|
@@ -118,7 +118,7 @@ set_target_properties(antlr4_static
|
|
ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}
|
|
COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
|
|
|
|
-install(TARGETS antlr4_shared
|
|
+install(TARGETS antlr4_shared OPTIONAL
|
|
DESTINATION lib
|
|
EXPORT antlr4-targets)
|
|
install(TARGETS antlr4_static
|
|
diff --git a/runtime/Cpp/runtime/src/support/Any.h b/runtime/Cpp/runtime/src/support/Any.h
|
|
index 468db98..65a473b 100644
|
|
--- a/runtime/Cpp/runtime/src/support/Any.h
|
|
+++ b/runtime/Cpp/runtime/src/support/Any.h
|
|
@@ -122,12 +122,12 @@ private:
|
|
}
|
|
|
|
private:
|
|
- template<int N = 0, typename std::enable_if<N == N && std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
|
|
+ template<int N = 0, typename std::enable_if<N == N && std::is_copy_constructible<T>::value, int>::type = 0>
|
|
Base* clone() const {
|
|
return new Derived<T>(value);
|
|
}
|
|
|
|
- template<int N = 0, typename std::enable_if<N == N && !std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
|
|
+ template<int N = 0, typename std::enable_if<N == N && !std::is_copy_constructible<T>::value, int>::type = 0>
|
|
Base* clone() const {
|
|
return nullptr;
|
|
}
|