Skip to content

Commit 579adb8

Browse files
deanberrisdeanberris
committed
Build Green!
Now we're at a state where: - We live in namespace network:: - We rely on Boost mostly - We have dropped the BOOST_ prefix for macros
1 parent 0eb17fc commit 579adb8

30 files changed

+66
-66
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ find_package( Threads )
1414
set(CMAKE_VERBOSE_MAKEFILE true)
1515

1616
if (CMAKE_BUILD_TYPE MATCHES Debug)
17-
add_definitions(-DBOOST_NETWORK_DEBUG)
17+
add_definitions(-DNETWORK_DEBUG)
1818
endif()
1919

2020
if (OPENSSL_FOUND)
21-
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
21+
add_definitions(-DNETWORK_ENABLE_HTTPS)
2222
endif()
2323

2424
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)

‎include/network/protocol/http/client/connection/connection_factory.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112
8-
#define BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112
7+
#ifndef NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112
8+
#define NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112
99

1010
#include <boost/shared_ptr.hpp>
1111

@@ -34,4 +34,4 @@ struct connection_factory {
3434
} // namespace http
3535
} // namespace network
3636

37-
#endif /* BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112 */
37+
#endif /* NETWORK_PROTOCOL_HTTP_CLIENT_CONNECTION_CONNECTION_FACTORY_HPP_20111112 */

‎include/network/protocol/http/impl/parser.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// (See accompanying file LICENSE_1_0.txt or copy at
99
// http://www.boost.org/LICENSE_1_0.txt)
1010

11-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_PARSER_IPP
12-
#define BOOST_NETWORK_PROTOCOL_HTTP_PARSER_IPP
11+
#ifndef NETWORK_PROTOCOL_HTTP_PARSER_IPP
12+
#define NETWORK_PROTOCOL_HTTP_PARSER_IPP
1313

1414
#include <network/protocol/http/parser.hpp>
1515

@@ -777,4 +777,4 @@ static bool basic_parser<Tag,Traits>::parse_cookie_header(types::cookie_params&
777777
} // namespace http
778778
} // namespace network
779779

780-
#endif // BOOST_NETWORK_PROTOCOL_HTTP_PARSER_IPP
780+
#endif // NETWORK_PROTOCOL_HTTP_PARSER_IPP

‎include/network/protocol/http/message/directives/minor_version.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120
8-
#define BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120
7+
#ifndef NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120
8+
#define NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120
99

1010
#include <network/protocol/http/support/is_server.hpp>
1111
#include <boost/utility/enable_if.hpp>
@@ -35,5 +35,5 @@ minor_version(boost::uint8_t minor_version_) {
3535
} // namespace http
3636
} // namespace network
3737

38-
#endif /* BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120 */
38+
#endif /* NETWORK_PROTOCOL_HTTP_MESSAGE_DIRECTIVES_MINOR_VERSION_HPP_20101120 */
3939

‎include/network/protocol/http/message/wrappers/port.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// (See accompanying file LICENSE_1_0.txt or copy at
66
// http://www.boost.org/LICENSE_1_0.txt)
77

8-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618
9-
#define BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618
8+
#ifndef NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618
9+
#define NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618
1010

1111
#include <network/protocol/http/request/request_base.hpp>
1212
#include <boost/optional.hpp>
@@ -29,4 +29,4 @@ port(request_base const & request) {
2929
} // namespace http
3030
} // namespace network
3131

32-
#endif // BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618
32+
#endif // NETWORK_PROTOCOL_HTTP_MESSAGE_PORT_HPP_20100618

‎include/network/protocol/http/message/wrappers/port.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204
8-
#define BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204
7+
#ifndef NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204
8+
#define NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204
99

1010
#include <network/protocol/http/message/wrappers/port.hpp>
1111
#include <network/uri.hpp>
@@ -40,4 +40,4 @@ port_wrapper::operator boost::optional<boost::uint16_t> () const {
4040
} // namespace http
4141
} // namespace network
4242

43-
#endif // BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204
43+
#endif // NETWORK_PROTOCOL_HTTP_MESSAGE_WRAPPERS_PORT_IPP_20111204

‎include/network/protocol/http/request/request.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <boost/scoped_array.hpp>
1313

1414
#ifdef NETWORK_DEBUG
15-
BOOST_CONCEPT_ASSERT((boost::network::http::ClientRequest<boost::network::http::request>));
15+
BOOST_CONCEPT_ASSERT((network::http::ClientRequest<network::http::request>));
1616
#endif
1717

1818
namespace network { namespace http {

‎include/network/protocol/http/server/options.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#ifndef BOOST_NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318
8-
#define BOOST_NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318
7+
#ifndef NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318
8+
#define NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318
99

1010
#include <network/protocol/http/server/options.hpp>
1111
#include <boost/asio/io_service.hpp>
@@ -287,4 +287,4 @@ int server_options::linger_timeout() const {
287287

288288
} // namespace network
289289

290-
#endif // BOOST_NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318
290+
#endif // NETWORK_PROTOCOL_HTTP_SERVER_OPTIONS_IPP_20120318

‎include/network/protocol/http/support/is_client.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#ifndef BOOST_NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118
8-
#define BOOST_NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118
7+
#ifndef NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118
8+
#define NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118
99

1010
#include <boost/utility/enable_if.hpp>
1111

@@ -20,5 +20,5 @@ namespace network { namespace http {
2020
} // namespace http
2121
} // namespace network
2222

23-
#endif /* BOOST_NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118 */
23+
#endif /* NETWORK_PROTOCOL_SUPPORT_IS_CLIENT_HPP_20101118 */
2424

‎libs/network/src/client.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// (See accompanying file LICENSE_1_0.txt or copy at
66
// http://www.boost.org/LICENSE_1_0.txt)
77

8-
#ifdef BOOST_NETWORK_NO_LIB
9-
#warn Building the library even with BOOST_NETWORK_NO_LIB defined.
10-
#undef BOOST_NETWORK_NO_LIB
8+
#ifdef NETWORK_NO_LIB
9+
#warn Building the library even with NETWORK_NO_LIB defined.
10+
#undef NETWORK_NO_LIB
1111
#endif
1212

1313
#include <network/protocol/http/client/connection/normal_delegate.ipp>
1414

15-
#ifdef BOOST_NETWORK_ENABLE_HTTPS
15+
#ifdef NETWORK_ENABLE_HTTPS
1616
#include <network/protocol/http/client/connection/ssl_delegate.ipp>
1717
#endif

0 commit comments

Comments
 (0)