diff --git a/source/shared_lib/include/graphics/vec.h b/source/shared_lib/include/graphics/vec.h index f18df0a57..b57bbc6d8 100644 --- a/source/shared_lib/include/graphics/vec.h +++ b/source/shared_lib/include/graphics/vec.h @@ -190,11 +190,11 @@ namespace Shared { return reinterpret_cast(this); } - inline Vec2 & operator=(const Vec2 &v) { + /*inline Vec2 & operator=(const Vec2 &v) { this->x = v.x; this->y = v.y; return *this; - } + }*/ inline bool operator ==(const Vec2 &v) const { return x == v.x && y == v.y; @@ -420,12 +420,12 @@ namespace Shared { return reinterpret_cast(this); } - inline Vec3 & operator=(const Vec3 &v) { + /*inline Vec3 & operator=(const Vec3 &v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; - } + }*/ inline bool operator ==(const Vec3 &v) const { return x == v.x && y == v.y && z == v.z; @@ -697,13 +697,13 @@ namespace Shared { return reinterpret_cast(this); } - inline Vec4 & operator=(const Vec4 &v) { + /*inline Vec4 & operator=(const Vec4 &v) { this->x = v.x; this->y = v.y; this->z = v.z; this->w = v.w; return *this; - } + }*/ inline bool operator ==(const Vec4 &v) const { return x == v.x && y == v.y && z == v.z && w == v.w; diff --git a/source/shared_lib/include/xml/rapidxml/rapidxml.hpp b/source/shared_lib/include/xml/rapidxml/rapidxml.hpp index 5be655023..69264b642 100644 --- a/source/shared_lib/include/xml/rapidxml/rapidxml.hpp +++ b/source/shared_lib/include/xml/rapidxml/rapidxml.hpp @@ -657,9 +657,9 @@ namespace rapidxml xml_base() : m_name(0) , m_value(0) - , m_parent(0) , m_name_size(0) , m_value_size(0) + , m_parent(0) { } @@ -809,7 +809,7 @@ namespace rapidxml //! Constructs an empty attribute with the specified type. //! Consider using memory_pool of appropriate xml_document if allocating attributes manually. - xml_attribute() : m_next_attribute(0), m_prev_attribute(0) + xml_attribute() : m_prev_attribute(0), m_next_attribute(0) { } @@ -903,11 +903,11 @@ namespace rapidxml xml_node(node_type type) : m_type(type) , m_first_node(0) + , m_last_node(0) , m_first_attribute(0) , m_last_attribute(0) - , m_last_node(0) - , m_next_sibling(0) , m_prev_sibling(0) + , m_next_sibling(0) { } diff --git a/source/shared_lib/sources/platform/common/base_thread.cpp b/source/shared_lib/sources/platform/common/base_thread.cpp index abc35818a..ae86ee89e 100644 --- a/source/shared_lib/sources/platform/common/base_thread.cpp +++ b/source/shared_lib/sources/platform/common/base_thread.cpp @@ -33,11 +33,11 @@ namespace Shared { mutexThreadObjectAccessor(new Mutex(CODE_AT_LINE)), mutexThreadOwnerValid(new Mutex(CODE_AT_LINE)), mutexExecutingTask(new Mutex(CODE_AT_LINE)), + ptr(NULL), mutexStarted(new Mutex(CODE_AT_LINE)), - ptr(NULL), genericData(NULL) { + genericData(NULL) { if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d]\n", __FILE__, __FUNCTION__, __LINE__); - ptr = this; MutexSafeWrapper safeMutexMasterList(&mutexMasterThreadList); masterThreadList[ptr]++; diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp index 8fef015d1..1600510c8 100644 --- a/source/shared_lib/sources/platform/common/simple_threads.cpp +++ b/source/shared_lib/sources/platform/common/simple_threads.cpp @@ -379,11 +379,11 @@ namespace Shared { unsigned int millisecsBetweenExecutions, bool needTaskSignal, void *userdata, bool wantSetupAndShutdown) : BaseThread(), - simpleTaskInterface(NULL), - overrideShutdownTask(NULL), mutexSimpleTaskInterfaceValid(new Mutex(CODE_AT_LINE)), + simpleTaskInterface(NULL), mutexTaskSignaller(new Mutex(CODE_AT_LINE)), - mutexLastExecuteTimestamp(new Mutex(CODE_AT_LINE)) { + mutexLastExecuteTimestamp(new Mutex(CODE_AT_LINE)), + overrideShutdownTask(NULL) { uniqueID = "SimpleTaskThread"; this->simpleTaskInterface = simpleTaskInterface; @@ -391,7 +391,6 @@ namespace Shared { this->executionCount = executionCount; this->millisecsBetweenExecutions = millisecsBetweenExecutions; this->needTaskSignal = needTaskSignal; - this->overrideShutdownTask = NULL; this->userdata = userdata; this->wantSetupAndShutdown = wantSetupAndShutdown; //if(this->userdata != NULL) { diff --git a/source/shared_lib/sources/platform/sdl/thread.cpp b/source/shared_lib/sources/platform/sdl/thread.cpp index 7605aa7f4..ba63e94c0 100644 --- a/source/shared_lib/sources/platform/sdl/thread.cpp +++ b/source/shared_lib/sources/platform/sdl/thread.cpp @@ -135,7 +135,8 @@ namespace Shared { // ===================================== Thread::Thread() : thread(NULL), mutexthreadAccessor(new Mutex(CODE_AT_LINE)), - deleteAfterExecute(false), currentState(thrsNew) { + currentState(thrsNew), + deleteAfterExecute(false) { addThreadToList(); }