Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit4d2389b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parentsf86503f +27de355 commit4d2389b

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎CMakeLists.txt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@ endif()
7777

7878
message(STATUS"C++ Compiler ID:${CMAKE_CXX_COMPILER_ID}")
7979
message(STATUS"C++ Flags:${CMAKE_CXX_FLAGS} link flags:${CMAKE_CXX_LINK_FLAGS}")
80-
if (Boost_FOUND)
81-
if (MSVC)
82-
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
83-
endif(MSVC)
84-
if (WIN32)
85-
add_definitions(-D_WIN32_WINNT=0x0501)
86-
endif(WIN32)
87-
include_directories(${Boost_INCLUDE_DIRS})
88-
endif(Boost_FOUND)
80+
81+
if (MSVC)
82+
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
83+
endif(MSVC)
84+
if (WIN32)
85+
add_definitions(-D_WIN32_WINNT=0x0501)
86+
endif(WIN32)
87+
include_directories(${Boost_INCLUDE_DIRS})
8988

9089
message(STATUS"CPP-NETLIB options selected:")
9190
message(STATUS" CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")

‎error/src/error.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include<network/error.hpp>
77
#include<cstring>
8+
#include<string>
89

910
namespacenetwork {
1011

‎http/src/http/v2/client/client_errors.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include<network/config.hpp>
77
#include<network/http/v2/client/client_errors.hpp>
8+
#include<string>
89

910
namespacenetwork {
1011
namespacehttp {

‎http/src/network/protocol/http/client/options.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class client_options_pimpl {
3030
}
3131

3232
voidio_service(boost::asio::io_service* io_service) {
33-
io_service_ =io_service_;
33+
io_service_ =io_service;
3434
}
3535

3636
boost::asio::io_service*io_service()const {return io_service_; }

‎logging/test/logging_log_record.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
#include<gtest/gtest.h>
99

1010
#include<network/logging/logging.hpp>
11-
#defineNETWORK_ENABLE_LOGGING
11+
#ifndef NETWORK_ENABLE_LOGGING
12+
#defineNETWORK_ENABLE_LOGGING
13+
#endif
1214
#include<network/detail/debug.hpp>
1315

1416
usingnamespacenetwork::logging;
@@ -73,4 +75,4 @@ TEST(logging_log_record, macro_log) {
7375
NETWORK_MESSAGE("This is a log through the macro.");
7476
NETWORK_MESSAGE("This is a log through the macro, with a stream! Num="
7577
<<42 <<" - OK!");
76-
}
78+
}

‎message/src/network/detail/debug.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
The user can force the logging to be enabled by defining NETWORK_ENABLE_LOGGING.
1717
*/
18-
#if defined(NETWORK_DEBUG) && defined(NETWORK_ENABLE_LOGGING)
18+
#if defined(NETWORK_DEBUG) &&!defined(NETWORK_ENABLE_LOGGING)
1919
#defineNETWORK_ENABLE_LOGGING
2020
#endif
2121

‎mime/test/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ endif()
1313

1414
include_directories(${CPP-NETLIB_SOURCE_DIR}/mime/src)
1515

16-
if ( Boost_FOUND )
17-
add_executable ( mime-roundtrip mime-roundtrip.cpp )
18-
target_link_libraries ( mime-roundtrip )
19-
add_test ( mime-roundtrip mime-roundtrip )
20-
endif ()
21-
16+
add_executable ( mime-roundtrip mime-roundtrip.cpp )
17+
target_link_libraries ( mime-roundtrip )
18+
add_test ( mime-roundtrip mime-roundtrip )

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp