Skip to content

Added config.hpp to project (similar to uri/config.hpp) for compiler portability #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2013
Merged

Added config.hpp to project (similar to uri/config.hpp) for compiler portability #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12abb5
Added config.hpp to project (similar to uri/config.hpp) for compiler …
glynos Jul 27, 2013
bfee110
Updated uri submodule.
glynos Jul 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ endif()

if(CPP-NETLIB_BUILD_SINGLE_LIB)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/config/src
${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
${CMAKE_CURRENT_SOURCE_DIR}/http/src
${CMAKE_CURRENT_SOURCE_DIR}/logging/src
Expand Down
45 changes: 45 additions & 0 deletions config/src/network/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright (c) Glyn Matthews 2012, 2013.
// Copyright 2012 Dean Michael Berris <dberris@google.com>
// Copyright 2012 Google, Inc.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)


#ifndef NETWORK_CONFIG_INC
#define NETWORK_CONFIG_INC

#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>

#if defined(BOOST_ALL_DYN_LINK)
#define NETWORK_DECL BOOST_SYMBOL_EXPORT
#else
#define NETWORK_DECL
#endif // defined(BOOST_ALL_DYN_LINK)

#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
#define NETWORK_DEFAULTED_FUNCTION {}
#else
#define NETWORK_DEFAULTED_FUNCTION = default
#endif // defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)

#if defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
#define NETWORK_DELETED_FUNCTION {}
#else
#define NETWORK_DELETED_FUNCTION = delete
#endif // defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)

#if defined(BOOST_NO_CXX11_NOEXCEPT)
#define NETWORK_NOEXCEPT throw()
#else
#define NETWORK_NOEXCEPT noexcept
#endif // defined(BOOST_NO_CXX11_NOEXCEPT)

#if defined(BOOST_NO_CXX11_OVERRIDE)
#define NETWORK_OVERRIDE
#else
#define NETWORK_OVERRIDE override
#endif // defined(BOOST_NO_CXX11_OVERRIDE)

#endif // NETWORK_CONFIG_INC
2 changes: 1 addition & 1 deletion uri
Open in desktop
Submodule uri updated 13 files
+1 −1 README.rst
+1 −0 src/CMakeLists.txt
+1 −1 src/detail/uri_parse.cpp
+0 −22 src/detail/uri_parse.hpp
+16 −11 src/network/uri/detail/decode.hpp
+2 −2 src/network/uri/detail/encode.hpp
+59 −74 src/network/uri/uri.hpp
+84 −0 src/network/uri/uri_errors.hpp
+65 −126 src/uri.cpp
+66 −0 src/uri_errors.cpp
+70 −8 test/uri_encoding_test.cpp
+8 −8 test/uri_resolve_test.cpp
+52 −0 test/uri_test.cpp