Change inclusions

This commit is contained in:
Denis Blank 2017-09-26 23:28:50 +02:00
parent bc2d46ff40
commit 7a02148c9d
11 changed files with 29 additions and 26 deletions

View File

@ -37,12 +37,12 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
#include "continuable/detail/base.hpp" #include <continuable/detail/base.hpp>
#include "continuable/detail/composition.hpp" #include <continuable/detail/composition.hpp>
#include "continuable/detail/traits.hpp" #include <continuable/detail/traits.hpp>
#include "continuable/detail/transforms.hpp" #include <continuable/detail/transforms.hpp>
#include "continuable/detail/util.hpp" #include <continuable/detail/util.hpp>
namespace cti { namespace cti {
template <typename Data, typename Annotation> template <typename Data, typename Annotation>
@ -639,7 +639,8 @@ struct continuable_trait {
/// The continuable type for the given parameters. /// The continuable type for the given parameters.
using continuable = using continuable =
continuable_base<continuation, detail::signature_hint_tag<Args...>>; continuable_base<continuation,
detail::hints::signature_hint_tag<Args...>>;
}; };
} // end namespace cti } // end namespace cti

View File

@ -33,7 +33,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "continuable/continuable-base.hpp" #include <continuable/continuable-base.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -31,9 +31,10 @@
#ifndef CONTINUABLE_HPP_INCLUDED__ #ifndef CONTINUABLE_HPP_INCLUDED__
#define CONTINUABLE_HPP_INCLUDED__ #define CONTINUABLE_HPP_INCLUDED__
#include "continuable/continuable-base.hpp"
#include "function2/function2.hpp" #include "function2/function2.hpp"
#include <continuable/continuable-base.hpp>
namespace cti { namespace cti {
// clang-format off // clang-format off
namespace detail { namespace detail {

View File

@ -35,10 +35,10 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
#include "continuable/detail/hints.hpp" #include <continuable/detail/hints.hpp>
#include "continuable/detail/traits.hpp" #include <continuable/detail/traits.hpp>
#include "continuable/detail/util.hpp" #include <continuable/detail/util.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -33,14 +33,15 @@
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <mutex>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
#include "continuable/detail/base.hpp" #include <continuable/detail/base.hpp>
#include "continuable/detail/traits.hpp" #include <continuable/detail/traits.hpp>
#include "continuable/detail/util.hpp" #include <continuable/detail/util.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {
@ -380,7 +381,7 @@ auto finalize_composition(
// Determine the shared result between all continuations // Determine the shared result between all continuations
auto signature = util::unpack(composition, [](auto const&... args) { auto signature = util::unpack(composition, [](auto const&... args) {
return common_result_of(signature_hint_tag<>{}, return common_result_of(hints::signature_hint_tag<>{},
base::hint_of(util::identity_of(args))...); base::hint_of(util::identity_of(args))...);
}); });

View File

@ -31,7 +31,7 @@
#ifndef CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__ #ifndef CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__
#define CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__ #define CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -33,8 +33,8 @@
#include <type_traits> #include <type_traits>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
#include "continuable/detail/util.hpp" #include <continuable/detail/util.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -31,7 +31,7 @@
#ifndef CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__ #ifndef CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__
#define CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__ #define CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -33,8 +33,8 @@
#include <future> #include <future>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
#include "continuable/detail/hints.hpp" #include <continuable/detail/hints.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -35,7 +35,7 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include "continuable/detail/api.hpp" #include <continuable/detail/api.hpp>
namespace cti { namespace cti {
namespace detail { namespace detail {

View File

@ -20,6 +20,6 @@
SOFTWARE. SOFTWARE.
**/ **/
#include "continuable/continuable.hpp" #include <continuable/continuable.hpp>
int main(int, char**) { return 0; } int main(int, char**) { return 0; }