Commit d2423e00 authored by neverlord's avatar neverlord

maintenance

parent c1f41337
...@@ -59,7 +59,7 @@ class is_stl_compliant_list ...@@ -59,7 +59,7 @@ class is_stl_compliant_list
// mutable pointer // mutable pointer
C* mc, C* mc,
// check if there's a 'void push_back()' that takes C::value_type // check if there's a 'void push_back()' that takes C::value_type
decltype(mc->push_back(typename C::value_type()))* = 0 decltype(mc->push_back(typename C::value_type()))* = nullptr
) )
{ {
return true; return true;
...@@ -93,7 +93,7 @@ class is_stl_compliant_map ...@@ -93,7 +93,7 @@ class is_stl_compliant_map
return true; return true;
} }
static void cmp_help_fun(...) { } static void cmp_help_fun(void*) { }
typedef decltype(cmp_help_fun(static_cast<T*>(nullptr))) result_type; typedef decltype(cmp_help_fun(static_cast<T*>(nullptr))) result_type;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
namespace cppa { namespace detail { namespace cppa { namespace detail {
enum class yield_state enum class yield_state : int
{ {
// yield() wasn't called yet // yield() wasn't called yet
invalid, invalid,
......
...@@ -58,7 +58,7 @@ class is_forward_iterator ...@@ -58,7 +58,7 @@ class is_forward_iterator
return true; return true;
} }
static void sfinae_fun(...) { } static void sfinae_fun(void*) { }
typedef decltype(sfinae_fun(static_cast<T*>(nullptr))) result_type; typedef decltype(sfinae_fun(static_cast<T*>(nullptr))) result_type;
......
...@@ -55,7 +55,7 @@ class is_iterable ...@@ -55,7 +55,7 @@ class is_iterable
} }
// SFNINAE default // SFNINAE default
static void sfinae_fun(...) { } static void sfinae_fun(void const*) { }
typedef decltype(sfinae_fun(static_cast<T const*>(nullptr))) result_type; typedef decltype(sfinae_fun(static_cast<T const*>(nullptr))) result_type;
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
namespace cppa { namespace detail { namespace cppa { namespace detail {
std::string demangle(const char* decorated) std::string demangle(char const* decorated)
{ {
size_t size; size_t size;
int status; int status;
...@@ -54,7 +54,7 @@ std::string demangle(const char* decorated) ...@@ -54,7 +54,7 @@ std::string demangle(const char* decorated)
} }
std::string result; // the undecorated typeid name std::string result; // the undecorated typeid name
result.reserve(size); result.reserve(size);
const char* cstr = undecorated; char const* cstr = undecorated;
// filter unnecessary characters from undecorated // filter unnecessary characters from undecorated
char c = *cstr; char c = *cstr;
while (c != '\0') while (c != '\0')
......
...@@ -36,9 +36,9 @@ namespace { ...@@ -36,9 +36,9 @@ namespace {
using namespace cppa; using namespace cppa;
__thread detail::yield_state* t_ystate = nullptr;
__thread util::fiber* t_caller = nullptr; __thread util::fiber* t_caller = nullptr;
__thread util::fiber* t_callee = nullptr; __thread util::fiber* t_callee = nullptr;
__thread detail::yield_state t_ystate = detail::yield_state::invalid;
} // namespace <anonymous> } // namespace <anonymous>
...@@ -46,17 +46,18 @@ namespace cppa { namespace detail { ...@@ -46,17 +46,18 @@ namespace cppa { namespace detail {
void yield(yield_state ystate) void yield(yield_state ystate)
{ {
t_ystate = ystate; *t_ystate = ystate;
util::fiber::swap(*t_callee, *t_caller); util::fiber::swap(*t_callee, *t_caller);
} }
yield_state call(util::fiber* what, util::fiber* from) yield_state call(util::fiber* what, util::fiber* from)
{ {
t_ystate = yield_state::invalid; yield_state result;
t_ystate = &result;
t_caller = from; t_caller = from;
t_callee = what; t_callee = what;
util::fiber::swap(*from, *what); util::fiber::swap(*from, *what);
return t_ystate; return result;
} }
} } // namespace cppa::detail } } // namespace cppa::detail
...@@ -133,7 +133,6 @@ void yielding_actor::dequeue(timed_invoke_rules& rules) ...@@ -133,7 +133,6 @@ void yielding_actor::dequeue(timed_invoke_rules& rules)
void yielding_actor::resume(util::fiber* from, resume_callback* callback) void yielding_actor::resume(util::fiber* from, resume_callback* callback)
{ {
self.set(this); self.set(this);
//set_self(this);
for (;;) for (;;)
{ {
switch (call(&m_fiber, from)) switch (call(&m_fiber, from))
......
...@@ -66,4 +66,8 @@ size_t test__primitive_variant(); ...@@ -66,4 +66,8 @@ size_t test__primitive_variant();
void test__queue_performance(); void test__queue_performance();
using std::cout;
using std::endl;
using std::cerr;
#endif // TEST_HPP #endif // TEST_HPP
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