boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 12:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/constexpr

Browse Source
This commit is contained in:
Peter Dimov
2018-01-21 22:32:19 +02:00
parent 61b4d8ef24 653f132147
commit fe28fa163c
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -63,11 +63,11 @@ install:
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system
- python tools/boostdep/depinst/depinst.py system - python tools/boostdep/depinst/depinst.py system
- cmd /c bootstrap - cmd /c bootstrap
- b2 headers - b2 -d0 headers
build: off build: off
test_script: test_script:
- PATH=%ADDPATH%%PATH% - PATH=%ADDPATH%%PATH%
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- b2 -j 3 libs/system/test toolset=%TOOLSET% %CXXSTD% - b2 -j3 libs/system/test toolset=%TOOLSET% %CXXSTD%

5
test/Jamfile.v2
View File

@ -21,6 +21,9 @@ project
<link>static:<define>BOOST_SYSTEM_STATIC_LINK=1 <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
; ;
lib single_instance_lib1 : single_instance_1.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
lib single_instance_lib2 : single_instance_2.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
rule cxx03 ( properties * ) rule cxx03 ( properties * )
{ {
local result ; local result ;
@ -107,6 +110,8 @@ project
[ system-run- std_interop_test.cpp ] [ system-run- std_interop_test.cpp ]
[ system-run std_mismatch_test.cpp ] [ system-run std_mismatch_test.cpp ]
[ system-run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp ] [ system-run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp ]
[ run single_instance_test.cpp single_instance_lib1 single_instance_lib2 : : : <link>static : single_instance_lib_static ]
[ run single_instance_test.cpp single_instance_lib1 single_instance_lib2 : : : <link>shared : single_instance_lib_shared ]
[ system-run before_main_test.cpp ] [ system-run before_main_test.cpp ]
[ system-run- constexpr_test.cpp ] [ system-run- constexpr_test.cpp ]
; ;

13
test/single_instance_1.cpp
View File

@ -2,19 +2,26 @@
// Copyright 2018 Peter Dimov. // Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
#include <boost/system/error_code.hpp> #include <boost/config.hpp>
#if defined(SINGLE_INSTANCE_DYN_LINK) && defined(BOOST_HAS_DECLSPEC)
# define EXPORT __declspec(dllexport)
#else
# define EXPORT
#endif
#include <boost/system/error_code.hpp>
using namespace boost::system; using namespace boost::system;
namespace lib1 namespace lib1
{ {
error_code get_system_code() EXPORT error_code get_system_code()
{ {
return error_code( 0, system_category() ); return error_code( 0, system_category() );
} }
error_code get_generic_code() EXPORT error_code get_generic_code()
{ {
return error_code( 0, generic_category() ); return error_code( 0, generic_category() );
} }

13
test/single_instance_2.cpp
View File

@ -2,19 +2,26 @@
// Copyright 2018 Peter Dimov. // Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
#include <boost/system/error_code.hpp> #include <boost/config.hpp>
#if defined(SINGLE_INSTANCE_DYN_LINK) && defined(BOOST_HAS_DECLSPEC)
# define EXPORT __declspec(dllexport)
#else
# define EXPORT
#endif
#include <boost/system/error_code.hpp>
using namespace boost::system; using namespace boost::system;
namespace lib2 namespace lib2
{ {
error_code get_system_code() EXPORT error_code get_system_code()
{ {
return error_code( 0, system_category() ); return error_code( 0, system_category() );
} }
error_code get_generic_code() EXPORT error_code get_generic_code()
{ {
return error_code( 0, generic_category() ); return error_code( 0, generic_category() );
} }