zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ci skip] use a policy in the CMakeLists.txt for toml11 fix some more string_view errors

Browse Source
This commit is contained in:
Philip Top
2019-12-19 12:49:33 -08:00
committed by Philip Top
parent 26a066ad07
commit 99e483c447
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1,9 +1,5 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
enable_testing() enable_testing()
if("${CMAKE_VERSION}" VERSION_GREATER 3.1)
project(toml11 VERSION 3.2.0)
else()
project(toml11)
project(toml11 VERSION 3.7.0) project(toml11 VERSION 3.7.0)

2
toml/get.hpp
View File

@@ -140,7 +140,7 @@ get(basic_value<C, M, V>&& v)
// ============================================================================ // ============================================================================
// std::string_view // std::string_view
#if __cplusplus >= 201703L #if defined(TOML11_USING_STRING_VIEW) && TOML11_USING_STRING_VIEW>0
template<typename T, typename C, template<typename T, typename C,
template<typename ...> class M, template<typename ...> class V> template<typename ...> class M, template<typename ...> class V>
inline detail::enable_if_t<std::is_same<T, std::string_view>::value, std::string_view> inline detail::enable_if_t<std::is_same<T, std::string_view>::value, std::string_view>

2
toml/value.hpp
View File

@@ -624,7 +624,7 @@ class basic_value
assigner(this->string_, toml::string(std::string(s), kind)); assigner(this->string_, toml::string(std::string(s), kind));
} }
#if __cplusplus >= 201703L #if defined(TOML11_USING_STRING_VIEW) && TOML11_USING_STRING_VIEW>0
basic_value(std::string_view s) basic_value(std::string_view s)
: type_(value_t::string), : type_(value_t::string),
region_info_(std::make_shared<region_base>(region_base{})) region_info_(std::make_shared<region_base>(region_base{}))