Skip to content

Commit

Permalink
Renamed internal dependencies namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
sztomi committed Feb 27, 2016
1 parent eae71fd commit 3a7db94
Show file tree
Hide file tree
Showing 400 changed files with 7,198 additions and 7,152 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Expand Up @@ -22,6 +22,8 @@ endif()
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

add_definitions(-DASIO_STANDALONE)
add_definitions(-DCALLME_ASIO=clmdep_asio)
add_definitions(-DCALLME_FMT=clmdep_fmt)

include_directories(include
dependencies/include)
Expand Down
10 changes: 5 additions & 5 deletions dependencies/include/asio/async_result.hpp
Expand Up @@ -20,7 +20,7 @@

#include "asio/detail/push_options.hpp"

namespace asio {
namespace clmdep_asio {

/// An interface for customising the behaviour of an initiating function.
/**
Expand Down Expand Up @@ -75,7 +75,7 @@ struct async_result_type_helper
};

} // namespace detail
} // namespace asio
} // namespace clmdep_asio

#include "asio/detail/pop_options.hpp"

Expand All @@ -84,11 +84,11 @@ struct async_result_type_helper
void_or_deduced
#elif defined(_MSC_VER) && (_MSC_VER < 1500)
# define ASIO_INITFN_RESULT_TYPE(h, sig) \
typename ::asio::detail::async_result_type_helper<h, sig>::type
typename ::clmdep_asio::detail::async_result_type_helper<h, sig>::type
#else
# define ASIO_INITFN_RESULT_TYPE(h, sig) \
typename ::asio::async_result< \
typename ::asio::handler_type<h, sig>::type>::type
typename ::clmdep_asio::async_result< \
typename ::clmdep_asio::handler_type<h, sig>::type>::type
#endif

#endif // ASIO_ASYNC_RESULT_HPP

0 comments on commit 3a7db94

Please sign in to comment.