Commit 478c9c04 authored by Dominik Charousset's avatar Dominik Charousset

maintenance

parent 0f8c067e
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "cppa/util/at.hpp" #include "cppa/util/at.hpp"
#include "cppa/util/fixed_vector.hpp" #include "cppa/util/fixed_vector.hpp"
#include "cppa/util/replace_type.hpp"
#include "cppa/util/is_comparable.hpp" #include "cppa/util/is_comparable.hpp"
#include "cppa/util/compare_tuples.hpp" #include "cppa/util/compare_tuples.hpp"
#include "cppa/util/is_legal_tuple_type.hpp" #include "cppa/util/is_legal_tuple_type.hpp"
......
...@@ -120,10 +120,8 @@ struct types_only_eq_type { ...@@ -120,10 +120,8 @@ struct types_only_eq_type {
}; };
namespace { namespace {
constexpr full_eq_type full_eq; constexpr full_eq_type full_eq;
constexpr types_only_eq_type types_only_eq; constexpr types_only_eq_type types_only_eq;
} // namespace <anonymous> } // namespace <anonymous>
} } // namespace cppa::detail } } // namespace cppa::detail
......
...@@ -47,29 +47,42 @@ namespace cppa { namespace detail { ...@@ -47,29 +47,42 @@ namespace cppa { namespace detail {
template<typename T> template<typename T>
struct implicit_conversions { struct implicit_conversions {
typedef typename util::replace_type<T, std::string,
std::is_same<T, const char*>, typedef typename util::replace_type<
std::is_same<T, char*>, T,
util::is_array_of<T, char>, std::string,
util::is_array_of<T, const char> >::type std::is_same<T, const char*>,
std::is_same<T, char*>,
util::is_array_of<T, char>,
util::is_array_of<T, const char>
>::type
subtype1; subtype1;
typedef typename util::replace_type<subtype1, std::u16string, typedef typename util::replace_type<
std::is_same<subtype1, const char16_t*>, subtype1,
std::is_same<subtype1, char16_t*>, std::u16string,
util::is_array_of<subtype1, char16_t>>::type std::is_same<subtype1, const char16_t*>,
std::is_same<subtype1, char16_t*>,
util::is_array_of<subtype1, char16_t>
>::type
subtype2; subtype2;
typedef typename util::replace_type<subtype2, std::u32string, typedef typename util::replace_type<
std::is_same<subtype2, const char32_t*>, subtype2,
std::is_same<subtype2, char32_t*>, std::u32string,
util::is_array_of<subtype2, char32_t>>::type std::is_same<subtype2, const char32_t*>,
std::is_same<subtype2, char32_t*>,
util::is_array_of<subtype2, char32_t>
>::type
subtype3; subtype3;
typedef typename util::replace_type<subtype3, actor_ptr, typedef typename util::replace_type<
std::is_convertible<T, actor*>, subtype3,
std::is_convertible<T, local_actor*>, actor_ptr,
std::is_same<self_type,T>>::type std::is_convertible<T, actor*>,
std::is_convertible<T, local_actor*>,
std::is_same<self_type, T>
>::type
type; type;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment