feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Remove uses of BOOST_SYSTEM_HAS_SYSTEM_ERROR

Browse Source
This commit is contained in:
Peter Dimov
2024-01-17 06:49:19 +02:00
parent 80e019069c
commit 3ded81eed0
33 changed files with 16 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ec_hash_value_test.cpp
-6
View File
@@ -7,9 +7,7 @@
#include <boost/system/system_category.hpp>
#include <boost/core/lightweight_test.hpp>
#include <cerrno>
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
#include <system_error>
#endif
namespace sys = boost::system;
@@ -69,8 +67,6 @@ int main()
BOOST_TEST( e2 == e3 || hash_value( e2 ) != hash_value( e3 ) );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
// std:: wrapping against normal
{
std::error_code e1( EINVAL, std::generic_category() );
@@ -126,7 +122,5 @@ int main()
BOOST_TEST( e2 == e3 || hash_value( e2 ) != hash_value( e3 ) );
}
#endif
return boost::report_errors();
}
test/ec_location_test.cpp
+1 -5
View File
@@ -85,8 +85,6 @@ int main()
BOOST_TEST_EQ( ec.location().line(), 75 );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
std::error_code e2( val, std::generic_category() );
@@ -107,10 +105,8 @@ int main()
BOOST_TEST( ec.failed() );
BOOST_TEST( ec.has_location() );
BOOST_TEST_EQ( ec.location().line(), 100 );
BOOST_TEST_EQ( ec.location().line(), 98 );
}
#endif
return boost::report_errors();
}
test/ec_location_test2.cpp
+3 -11
View File
@@ -32,8 +32,6 @@ sys::error_code make_error_code( E e )
return e == 0? sys::error_code(): sys::error_code( e, sys::generic_category() );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
enum E2
{
e2inval = EINVAL
@@ -57,8 +55,6 @@ std::error_code make_error_code( E2 e )
return std::error_code( e, std::generic_category() );
}
#endif
int main()
{
{
@@ -84,7 +80,7 @@ int main()
BOOST_TEST( ec.failed() );
BOOST_TEST( ec.has_location() );
BOOST_TEST_EQ( ec.location().line(), 77 );
BOOST_TEST_EQ( ec.location().line(), 73 );
}
{
@@ -134,7 +130,7 @@ int main()
BOOST_TEST( ec.failed() );
BOOST_TEST( ec.has_location() );
BOOST_TEST_EQ( ec.location().line(), 127 );
BOOST_TEST_EQ( ec.location().line(), 123 );
}
{
@@ -182,7 +178,7 @@ int main()
BOOST_TEST( ec.failed() );
BOOST_TEST( ec.has_location() );
BOOST_TEST_EQ( ec.location().line(), 175 );
BOOST_TEST_EQ( ec.location().line(), 171 );
}
{
@@ -209,8 +205,6 @@ int main()
BOOST_TEST_EQ( ec.location().line(), 0 );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
sys::error_code ec( e2inval );
@@ -281,7 +275,5 @@ int main()
BOOST_TEST_EQ( ec.location().line(), 0 );
}
#endif
return boost::report_errors();
}
test/ec_location_test3.cpp
-4
View File
@@ -57,8 +57,6 @@ int main()
BOOST_TEST_EQ( ec3.location(), boost::source_location() );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
std::error_code e2( val, std::generic_category() );
@@ -84,7 +82,5 @@ int main()
BOOST_TEST_EQ( ec3.location(), boost::source_location() );
}
#endif
return boost::report_errors();
}
test/ec_location_test4.cpp
-4
View File
@@ -59,8 +59,6 @@ int main()
BOOST_TEST_EQ( ec.location(), boost::source_location() );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
std::error_code e2( val, std::generic_category() );
@@ -87,7 +85,5 @@ int main()
BOOST_TEST_EQ( ec.location(), boost::source_location() );
}
#endif
return boost::report_errors();
}
test/ec_what_test.cpp
-4
View File
@@ -62,8 +62,6 @@ int main()
BOOST_TEST_EQ( ec.what(), ec.message() + " [system:5 at " + loc.to_string() + "]" );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
std::error_code ec;
sys::error_code ec2( ec );
@@ -85,7 +83,5 @@ int main()
BOOST_TEST_EQ( ec2.what(), ec2.message() + " [std:system:5]" );
}
#endif
return boost::report_errors();
}
test/result_error_construct4.cpp
-4
View File
@@ -30,8 +30,6 @@ int main()
BOOST_TEST_EQ( r.error(), ec );
}
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
{
auto ec = make_error_code( std::errc::invalid_argument );
@@ -43,7 +41,5 @@ int main()
BOOST_TEST_EQ( r.error(), ec );
}
#endif
return boost::report_errors();
}
test/std_interop_test.cpp
-22
View File
@@ -9,23 +9,6 @@
// See library home page at http://www.boost.org/libs/system
#include <boost/system/error_code.hpp>
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <iostream>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main()
{
std::cout
<< "The version of the C++ standard library being used does not"
" support header <system_error> so interoperation will not be tested.\n";
}
#else
#include <boost/core/lightweight_test.hpp>
#include <boost/core/snprintf.hpp>
#include <system_error>
@@ -337,9 +320,6 @@ static void test_user2_category()
int main()
{
std::cout
<< "The version of the C++ standard library being used"
" supports header <system_error> so interoperation will be tested.\n";
test_generic_category();
test_system_category();
test_user_category();
@@ -347,5 +327,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test10.cpp
-11
View File
@@ -4,16 +4,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
@@ -62,5 +53,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test11.cpp
+1 -6
View File
@@ -8,12 +8,7 @@
#include <boost/config.hpp>
#include <ios>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "Skipping test, BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined" )
int main() {}
#elif defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 50000
#if defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 50000
BOOST_PRAGMA_MESSAGE( "Skipping test, BOOST_LIBSTDCXX_VERSION < 50000" )
int main() {}
test/std_interop_test12.cpp
-11
View File
@@ -6,17 +6,8 @@
#include <boost/system/error_category.hpp>
#include <boost/system/errc.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
enum my_errc
@@ -123,5 +114,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test13.cpp
-11
View File
@@ -5,17 +5,8 @@
#include <boost/system/error_code.hpp>
#include <boost/system/error_category.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
class my_category_impl: public std::error_category
@@ -73,5 +64,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test14.cpp
-11
View File
@@ -5,17 +5,8 @@
#include <boost/system/error_code.hpp>
#include <boost/system/error_category.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
class my_category_impl: public boost::system::error_category
@@ -53,5 +44,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test15.cpp
+1 -6
View File
@@ -9,12 +9,7 @@
#include <boost/config.hpp>
#include <boost/config/workaround.hpp>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#elif defined(BOOST_SYSTEM_AVOID_STD_GENERIC_CATEGORY)
#if defined(BOOST_SYSTEM_AVOID_STD_GENERIC_CATEGORY)
BOOST_PRAGMA_MESSAGE( "Skipping test, BOOST_SYSTEM_AVOID_STD_GENERIC_CATEGORY is defined" )
int main() {}
test/std_interop_test16.cpp
-11
View File
@@ -3,15 +3,6 @@
// http://www.boost.org/LICENSE_1_0.txt
#include <boost/system/error_category.hpp>
#include <boost/config/pragma_message.hpp>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <boost/core/lightweight_test.hpp>
#include <boost/core/snprintf.hpp>
#include <system_error>
@@ -53,5 +44,3 @@ int main()
BOOST_TEST_CSTR_EQ( cat.name(), "user" );
return boost::report_errors();
}
#endif
test/std_interop_test2.cpp
-11
View File
@@ -6,16 +6,7 @@
#include <boost/system/system_category.hpp>
#include <boost/system/generic_category.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
void f1( std::error_code ec, int value, std::error_category const& category )
@@ -94,5 +85,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test3.cpp
-11
View File
@@ -4,16 +4,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
@@ -75,5 +66,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test4.cpp
-11
View File
@@ -4,16 +4,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
void f( std::error_code& e1, std::error_code e2 )
@@ -85,5 +76,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test5.cpp
-11
View File
@@ -4,16 +4,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
@@ -104,5 +95,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test6.cpp
-11
View File
@@ -4,16 +4,7 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
@@ -136,5 +127,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test7.cpp
-11
View File
@@ -4,17 +4,8 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
@@ -48,5 +39,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test8.cpp
-11
View File
@@ -4,17 +4,8 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
enum my_errc
@@ -78,5 +69,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_interop_test9.cpp
-11
View File
@@ -4,17 +4,8 @@
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
enum my_errc
@@ -73,5 +64,3 @@ int main()
return boost::report_errors();
}
#endif
test/std_mismatch_test.cpp
+1 -23
View File
@@ -12,24 +12,8 @@
# define _CRT_SECURE_NO_WARNINGS
#include <boost/system/error_code.hpp>
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <iostream>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main()
{
std::cout
<< "The version of the C++ standard library being used does not"
" support header <system_error> so interoperation will not be tested.\n";
}
#else
#include <boost/core/lightweight_test.hpp>
#include <boost/config.hpp>
#include <system_error>
#include <cerrno>
#include <string>
@@ -53,14 +37,8 @@ static void test_system_category()
int main()
{
std::cout
<< "The version of the C++ standard library being used"
" supports header <system_error> so interoperation will be tested.\n";
test_generic_category();
test_system_category();
return boost::report_errors();
}
#endif
test/std_single_instance_1.cpp
-11
View File
@@ -11,9 +11,6 @@
#endif
#include <boost/system/error_code.hpp>
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
#include <system_error>
namespace lib1
@@ -30,11 +27,3 @@ EXPORT std::error_code get_generic_code()
}
} // namespace lib1
#else
EXPORT void lib1_f()
{
}
#endif
test/std_single_instance_2.cpp
-11
View File
@@ -11,9 +11,6 @@
#endif
#include <boost/system/error_code.hpp>
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
#include <system_error>
namespace lib2
@@ -30,11 +27,3 @@ EXPORT std::error_code get_generic_code()
}
} // namespace lib2
#else
EXPORT void lib2_f()
{
}
#endif
test/std_single_instance_test.cpp
+1 -6
View File
@@ -6,12 +6,7 @@
#include <boost/config/pragma_message.hpp>
#include <boost/config/helper_macros.hpp>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(__CYGWIN__)
#if defined(STD_SINGLE_INSTANCE_SHARED) && defined(__CYGWIN__)
BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, __CYGWIN__" )
int main() {}
test/win32_generic_test.cpp
+1 -6
View File
@@ -6,12 +6,7 @@
#include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "Skipping test, BOOST_SYSTEM_HAS_SYSTEM_ERROR is not defined" )
int main() {}
#elif !defined(BOOST_MSSTL_VERSION) || BOOST_MSSTL_VERSION < 140
#if !defined(BOOST_MSSTL_VERSION) || BOOST_MSSTL_VERSION < 140
BOOST_PRAGMA_MESSAGE( "Skipping test, BOOST_MSSTL_VERSION is not defined or is less than 140" )
int main() {}