feedc0de/boost_container_hash
1
0
Fork 0
forked from boostorg/container_hash
Code Pull Requests Activity

Use Config macros for detecting C++17 headers

Browse Source
This commit is contained in:
Peter Dimov
2021-10-16 16:43:11 +03:00
parent e89fe04479
commit b201ff97a8
5 changed files with 50 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/hash_info.cpp
+24 -21
View File
@@ -37,10 +37,9 @@ void write_compiler_info() {
{1700, "Visual C++ 11.0, VS2012"},
{1800, "Visual C++ 12.0, VS2013"},
{1900, "Visual C++ 14.00, VS2015"},
{1910, "Visual C++ 14.10, VS2017 15.1/2"},
{1911, "Visual C++ 14.11, VS2017 15.3/4"},
{1912, "Visual C++ 14.12, VS2017 15.5"},
{1913, "Visual C++ 14.13, VS2017 15.6"}
{1910, "Visual C++ 14.1x, VS2017"},
{1920, "Visual C++ 14.2x, VS2019"},
{1930, "Visual C++ 14.3x, VS2022"},
};
msvc_version msvc = { BOOST_MSVC, "" };
@@ -65,38 +64,42 @@ void write_compiler_info() {
int main() {
write_compiler_info();
#if defined(__cplusplus)
std::cout << "__cplusplus: "
<< __cplusplus
<< std::endl;
std::cout << "BOOST_CXX_VERSION: "
<< BOOST_CXX_VERSION
<< std::endl;
#if defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
std::cout << "No <string_view>" << std::endl;
#else
std::cout << "Has <string_view>" << std::endl;
#endif
std::cout << "BOOST_HASH_CXX17: "
<< BOOST_HASH_CXX17
<< std::endl;
#if defined(BOOST_NO_CXX17_HDR_OPTIONAL)
std::cout << "No <optional>" << std::endl;
#else
std::cout << "Has <optional>" << std::endl;
#endif
std::cout << "BOOST_HASH_HAS_STRING_VIEW: "
<< BOOST_HASH_HAS_STRING_VIEW
<< std::endl;
std::cout << "BOOST_HASH_HAS_OPTIONAL: "
<< BOOST_HASH_HAS_OPTIONAL
<< std::endl;
std::cout << "BOOST_HASH_HAS_VARIANT: "
<< BOOST_HASH_HAS_VARIANT
<< std::endl;
#if defined(BOOST_NO_CXX17_HDR_VARIANT)
std::cout << "No <variant>" << std::endl;
#else
std::cout << "Has <variant>" << std::endl;
#endif
#if defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
std::cout << "No <typeindex>" << std::endl;
#else
std::cout << "<typeindex>" << std::endl;
std::cout << "Has <typeindex>" << std::endl;
#endif
#if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
std::cout << "No <system_error>" << std::endl;
#else
std::cout << "<system_error>" << std::endl;
std::cout << "Has <system_error>" << std::endl;
#endif
}
test/hash_optional_test.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#include <boost/core/lightweight_test.hpp>
#if BOOST_HASH_HAS_OPTIONAL
#if !defined(BOOST_NO_CXX17_HDR_OPTIONAL)
#include <optional>
#include <string>
@@ -60,7 +60,7 @@ void test_optional_string()
int main()
{
#if BOOST_HASH_HAS_OPTIONAL
#if !defined(BOOST_NO_CXX17_HDR_OPTIONAL)
test_optional_int();
test_optional_string();
#else
test/hash_string_test.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ int main()
#endif
generic_string_tests((std::string*) 0);
#if BOOST_HASH_HAS_STRING_VIEW
#if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
generic_string_tests((std::string_view*) 0);
#endif
test/hash_variant_test.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#include <boost/core/lightweight_test.hpp>
#if BOOST_HASH_HAS_VARIANT
#if !defined(BOOST_NO_CXX17_HDR_VARIANT)
#include <variant>
#include <string>
@@ -90,7 +90,7 @@ void test_variant_unique_types()
int main()
{
#if BOOST_HASH_HAS_VARIANT
#if !defined(BOOST_NO_CXX17_HDR_VARIANT)
test_variant_int();
test_variant_unique_types();
#else