Commit d2c1f41d by Marcus Winter

fixed vc11 build problem

parent a56b5166
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define EMBB_BASE_C_LOG_H_ #define EMBB_BASE_C_LOG_H_
#include <embb/base/c/internal/config.h> #include <embb/base/c/internal/config.h>
#include <stdarg.h>
/** /**
* \defgroup C_LOG Logging * \defgroup C_LOG Logging
...@@ -197,6 +198,13 @@ void embb_log_error( ...@@ -197,6 +198,13 @@ void embb_log_error(
\c message */ \c message */
); );
/* function for internal use only */
void embb_log_write_internal(
char const * channel,
embb_log_level_t log_level,
char const * message,
va_list argp);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
#include <embb/base/log.h> #include <embb/base/log.h>
#include <embb/base/c/internal/unused.h> #include <embb/base/c/internal/unused.h>
#include <cstdarg>
extern "C" void embb_log_write_internal(
char const * channel,
embb_log_level_t log_level,
char const * message,
va_list argp);
namespace embb { namespace embb {
namespace base { namespace base {
......
...@@ -398,7 +398,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task( ...@@ -398,7 +398,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
node->scheduler); node->scheduler);
/* now wait and schedule new tasks if we are on a worker */ /* now wait and schedule new tasks if we are on a worker */
mtapi_task_state_t task_state = embb_atomic_load_int(&task->state); mtapi_task_state_t task_state = (mtapi_task_state_t)embb_atomic_load_int(&task->state);
while ( while (
(MTAPI_TASK_SCHEDULED == task_state) || (MTAPI_TASK_SCHEDULED == task_state) ||
(MTAPI_TASK_RUNNING == task_state) || (MTAPI_TASK_RUNNING == task_state) ||
...@@ -418,7 +418,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task( ...@@ -418,7 +418,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
node, node,
context); context);
task_state = embb_atomic_load_int(&task->state); task_state = (mtapi_task_state_t)embb_atomic_load_int(&task->state);
} }
return MTAPI_TRUE; return MTAPI_TRUE;
......
...@@ -187,7 +187,7 @@ mtapi_task_state_t mtapi_context_taskstate_get( ...@@ -187,7 +187,7 @@ mtapi_task_state_t mtapi_context_taskstate_get(
&(task_context->thread_context->tss_id)); &(task_context->thread_context->tss_id));
if (local_context == task_context->thread_context) { if (local_context == task_context->thread_context) {
task_state = embb_atomic_load_int(&task_context->task->state); task_state = (mtapi_task_state_t)embb_atomic_load_int(&task_context->task->state);
local_status = MTAPI_SUCCESS; local_status = MTAPI_SUCCESS;
} else { } else {
local_status = MTAPI_ERR_CONTEXT_OUTOFCONTEXT; local_status = MTAPI_ERR_CONTEXT_OUTOFCONTEXT;
......
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 sign in to comment