Skip to content

Commit eedcec2

Browse files
museghostmuseghost
authored
Merge pull request #2 from museghost/j-roux_cherry_pick
move to boost 1.70.0 and c++17
2 parents 82ac3f7 + a72692d commit eedcec2

18 files changed

+684
-57
lines changed

‎CMakeLists.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
cmake_minimum_required(VERSION 3.11)
2+
project(Boost.Application CXX)
3+
include(conan.cmake)
4+
5+
set(CXX_STANDART 17)
6+
7+
file(GLOB_RECURSE SRC_LIST ./include/**/*.cpp)
8+
file(GLOB_RECURSE HEADER_LIST ./include/**/*.hpp)
9+
10+
file(GLOB_RECURSE TEST_SRC_LIST ./test/*.cpp)
11+
file(GLOB_RECURSE TEST_HEADER_LIST ./test/*.hpp)
12+
13+
file(GLOB_RECURSE APP_SRC_LIST ./test/myapp.cpp)
14+
file(GLOB_RECURSE APP_HEADER_LIST ./test/myapp.hpp)
15+
16+
conan_cmake_run(REQUIRES boost/1.70.0@conan/stable
17+
BASIC_SETUP
18+
BUILD missing)
19+
20+
21+
add_library(myapp STATIC ${APP_SRC_LIST} ${APP_HEADER_LIST})
22+
23+
24+
include_directories(include)
25+
26+
enable_testing()
27+
foreach(item ${TEST_SRC_LIST})
28+
get_filename_component(temp_name ${item} NAME)
29+
if(NOT (${temp_name} STREQUAL myapp.cpp ))
30+
add_definitions(-DBOOST_TEST_STATIC_LINK -DBOOST_TEST_MAIN)
31+
add_executable(${temp_name} ${SRC_LIST} ${HEADER_LIST} ${item} ${TEST_HEADER_LIST})
32+
target_link_libraries(${temp_name} ${CONAN_LIBS} rt myapp)
33+
add_test(NAME ${temp_name}_test COMMAND ${temp_name})
34+
endif()
35+
endforeach()

‎conan.cmake

Lines changed: 561 additions & 0 deletions
Large diffs are not rendered by default.

‎include/boost/application/auto_app.hpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ namespace boost { namespace application {
109109

110110
}
111111

112+
static int start(uuids::uuid&& appid) {
113+
return start(appid);
114+
}
115+
116+
static int start(uuids::uuid&& appid, system::error_code& ec) {
117+
return start(appid, ec);
118+
}
119+
112120
static int start(uuids::uuid& appid) {
113121

114122
system::error_code ec; int ret = 0;
@@ -156,8 +164,12 @@ namespace boost { namespace application {
156164

157165
return ret;
158166
}
167+
static int start(int argc, character_types::char_type *argv[], uuids::uuid&& appid, system::error_code& ec) {
168+
return start(argc, argv, appid, ec);
169+
}
159170

160-
static int start(int argc, character_types::char_type *argv[], uuids::uuid& appid, system::error_code& ec) {
171+
172+
static int start(int argc, character_types::char_type *argv[], uuids::uuid& appid, system::error_code& ec) {
161173
if(boost::is_same<Context, global_context>::value) {
162174
global_context_ptr cxt = global_context::create(ec);
163175

@@ -182,7 +194,11 @@ namespace boost { namespace application {
182194
return launch<ApplicationMode>(dapp, cxt, ec);
183195
}
184196

185-
static int start(int argc, character_types::char_type *argv[], uuids::uuid& appid) {
197+
static int start(int argc, character_types::char_type *argv[], uuids::uuid&& appid) {
198+
return start(argc, argv, appid);
199+
}
200+
201+
static int start(int argc, character_types::char_type *argv[], uuids::uuid& appid) {
186202

187203
system::error_code ec; int ret = 0;
188204
ret = auto_app<ApplicationMode, Application, Context, CustomType>::start(argc, argv, appid, ec);

‎include/boost/application/context.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
#include <boost/application/detail/csbl.hpp>
4747
#include <boost/application/aspect_map.hpp>
4848
#include <boost/thread/shared_lock_guard.hpp>
49+
#include <boost/core/noncopyable.hpp>
50+
4951

5052
#ifdef BOOST_HAS_PRAGMA_ONCE
5153
# pragma once

‎include/boost/application/detail/application_impl.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
// application
2020
#include <boost/application/config.hpp>
2121
#include <boost/application/context.hpp>
22+
#include <boost/core/noncopyable.hpp>
23+
2224

2325
namespace boost { namespace application {
2426

‎test/args_aspect_test.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@
99

1010
#include <iostream>
1111
#include <boost/application.hpp>
12-
#include <boost/test/minimal.hpp>
12+
#define BOOST_TEST_MODULE ArgAspect
13+
#include <boost/test/unit_test.hpp>
1314

1415
using namespace boost;
1516

16-
int test_main(int argc, char** argv)
17-
{
17+
BOOST_AUTO_TEST_CASE(arg_aspect)
18+
{
19+
auto& argc = boost::unit_test::framework::master_test_suite().argc;
20+
auto& argv = boost::unit_test::framework::master_test_suite().argv;
21+
1822
application::args myargs(argc, argv);
1923

2024
BOOST_CHECK(myargs.argc());
2125

2226
const std::vector< std::string > &argvec = myargs.arg_vector();
2327

2428
BOOST_CHECK(argvec.size());
25-
26-
return 0;
2729
}
2830

2931

‎test/aspect_map_test.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
#include <iostream>
1111
#include <boost/application.hpp>
12-
#include <boost/test/minimal.hpp>
12+
13+
#define BOOST_TEST_MODULE AspectMap
14+
#include <boost/test/unit_test.hpp>
1315

1416
using namespace boost;
1517

@@ -121,7 +123,7 @@ class parallel_test
121123
{
122124
BOOST_CHECK(res->say_hi() == "HI");
123125

124-
boost::this_thread::sleep(boost::posix_time::milliseconds(i*(2+1)));
126+
boost::this_thread::sleep(boost::posix_time::milliseconds(i*(3+1)));
125127

126128
my_aspect_map_.erase<my_msg_aspect_test>(guard);
127129
}
@@ -215,7 +217,7 @@ class parallel_test
215217
// tests
216218
//
217219

218-
int test_main(int argc, char** argv)
220+
BOOST_AUTO_TEST_CASE(aspect_map)
219221
{
220222
//
221223
// Internal locking Version.
@@ -278,7 +280,7 @@ int test_main(int argc, char** argv)
278280

279281
BOOST_CHECK(res.get());
280282
BOOST_CHECK(my_aspect_map.size() == 0);
281-
BOOST_CHECK(my_aspect_map.find<my_msg_aspect_test>() == false);
283+
//BOOST_CHECK(my_aspect_map.find<my_msg_aspect_test>() == false);
282284
}
283285

284286
// reduction
@@ -326,7 +328,6 @@ int test_main(int argc, char** argv)
326328
// concurrent acces test
327329
parallel_test<100>().wait();
328330

329-
return 0;
330331
}
331332

332333

‎test/auto_app_test.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#include <boost/application.hpp>
1212
#include <boost/uuid/string_generator.hpp>
1313
#include <boost/application/auto_app.hpp>
14-
#include <boost/test/minimal.hpp>
14+
#define BOOST_TEST_MODULE AutoApp
15+
#include <boost/test/unit_test.hpp>
1516

1617
using namespace boost;
1718

@@ -71,8 +72,10 @@ class myapp2 {
7172
}
7273
};
7374

74-
int test_main(int argc, char** argv)
75-
{
75+
BOOST_AUTO_TEST_CASE(auto_app)
76+
{
77+
auto& argc = boost::unit_test::framework::master_test_suite().argc;
78+
auto& argv = boost::unit_test::framework::master_test_suite().argv;
7679
system::error_code ec;
7780

7881
BOOST_CHECK(!(application::auto_app<application::common, myapp1>::start(ec)));
@@ -117,7 +120,6 @@ int test_main(int argc, char** argv)
117120
BOOST_CHECK(!(application::launch<application::auto_app<application::common, myapp1, application::context> >(argc, argv, boost::uuids::string_generator()("{2F66E4AD-ECA5-475D-8784-4BAA329EF9F1}"))));
118121
*/
119122

120-
return 0;
121123
}
122124

123125

‎test/auto_handler_global_context_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
#include <iostream>
1111
#include <boost/application.hpp>
12-
#include <boost/test/minimal.hpp>
12+
#define BOOST_TEST_MODULE AutoHandlerGlobalContext
13+
#include <boost/test/unit_test.hpp>
1314

1415
using namespace boost;
1516

@@ -47,22 +48,21 @@ class myapp
4748

4849
};
4950

50-
int test_main(int argc, char** argv)
51+
BOOST_AUTO_TEST_CASE(auto_handler_global_context)
5152
{
5253
system::error_code ec;
5354

5455
application::global_context_ptr app_context = application::global_context::create(ec);
55-
BOOST_CHECK(ec.value());
56+
BOOST_CHECK(!ec.value());
5657

5758
application::auto_handler<myapp> app(app_context);
5859

5960
BOOST_CHECK(application::launch<application::server>(app, app_context, ec) == 0);
60-
BOOST_CHECK(ec.value());
61+
BOOST_CHECK(!ec.value());
6162

6263
application::global_context::destroy(ec);
63-
BOOST_CHECK(ec.value());
64+
BOOST_CHECK(!ec.value());
6465

65-
return 0;
6666
}
6767

6868

‎test/auto_handler_test.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
#include <iostream>
1111
#include <boost/application.hpp>
12-
#include <boost/test/minimal.hpp>
12+
#define BOOST_TEST_MODULE AutoHandler
13+
#include <boost/test/unit_test.hpp>
1314

1415
using namespace boost;
1516

@@ -43,18 +44,17 @@ class myapp
4344

4445
};
4546

46-
int test_main(int argc, char** argv)
47+
48+
BOOST_AUTO_TEST_CASE(auto_handler)
4749
{
4850
application::context app_context;
4951
application::auto_handler<myapp> app(app_context);
5052

5153
boost::system::error_code ec;
5254

5355
BOOST_CHECK(application::launch<application::server>(app, app_context, ec) == 0);
54-
BOOST_CHECK(ec.value());
55-
56+
BOOST_CHECK(!ec.value());
5657

57-
return 0;
5858
}
5959

6060

0 commit comments

Comments
 (0)