mirror of
https://github.com/glest/glest-source.git
synced 2025-08-12 11:24:00 +02:00
Fixed libstreflop warnings
This commit is contained in:
@@ -190,11 +190,11 @@ namespace Shared {
|
|||||||
return reinterpret_cast<const T*>(this);
|
return reinterpret_cast<const T*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Vec2<T> & operator=(const Vec2<T> &v) {
|
/*inline Vec2<T> & operator=(const Vec2<T> &v) {
|
||||||
this->x = v.x;
|
this->x = v.x;
|
||||||
this->y = v.y;
|
this->y = v.y;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
inline bool operator ==(const Vec2<T> &v) const {
|
inline bool operator ==(const Vec2<T> &v) const {
|
||||||
return x == v.x && y == v.y;
|
return x == v.x && y == v.y;
|
||||||
@@ -420,12 +420,12 @@ namespace Shared {
|
|||||||
return reinterpret_cast<const T*>(this);
|
return reinterpret_cast<const T*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Vec3<T> & operator=(const Vec3<T> &v) {
|
/*inline Vec3<T> & operator=(const Vec3<T> &v) {
|
||||||
this->x = v.x;
|
this->x = v.x;
|
||||||
this->y = v.y;
|
this->y = v.y;
|
||||||
this->z = v.z;
|
this->z = v.z;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
inline bool operator ==(const Vec3<T> &v) const {
|
inline bool operator ==(const Vec3<T> &v) const {
|
||||||
return x == v.x && y == v.y && z == v.z;
|
return x == v.x && y == v.y && z == v.z;
|
||||||
@@ -697,13 +697,13 @@ namespace Shared {
|
|||||||
return reinterpret_cast<const T*>(this);
|
return reinterpret_cast<const T*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Vec4<T> & operator=(const Vec4<T> &v) {
|
/*inline Vec4<T> & operator=(const Vec4<T> &v) {
|
||||||
this->x = v.x;
|
this->x = v.x;
|
||||||
this->y = v.y;
|
this->y = v.y;
|
||||||
this->z = v.z;
|
this->z = v.z;
|
||||||
this->w = v.w;
|
this->w = v.w;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
inline bool operator ==(const Vec4<T> &v) const {
|
inline bool operator ==(const Vec4<T> &v) const {
|
||||||
return x == v.x && y == v.y && z == v.z && w == v.w;
|
return x == v.x && y == v.y && z == v.z && w == v.w;
|
||||||
|
@@ -657,9 +657,9 @@ namespace rapidxml
|
|||||||
xml_base()
|
xml_base()
|
||||||
: m_name(0)
|
: m_name(0)
|
||||||
, m_value(0)
|
, m_value(0)
|
||||||
, m_parent(0)
|
|
||||||
, m_name_size(0)
|
, m_name_size(0)
|
||||||
, m_value_size(0)
|
, m_value_size(0)
|
||||||
|
, m_parent(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -809,7 +809,7 @@ namespace rapidxml
|
|||||||
|
|
||||||
//! Constructs an empty attribute with the specified type.
|
//! Constructs an empty attribute with the specified type.
|
||||||
//! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
|
//! 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)
|
xml_node(node_type type)
|
||||||
: m_type(type)
|
: m_type(type)
|
||||||
, m_first_node(0)
|
, m_first_node(0)
|
||||||
|
, m_last_node(0)
|
||||||
, m_first_attribute(0)
|
, m_first_attribute(0)
|
||||||
, m_last_attribute(0)
|
, m_last_attribute(0)
|
||||||
, m_last_node(0)
|
|
||||||
, m_next_sibling(0)
|
|
||||||
, m_prev_sibling(0)
|
, m_prev_sibling(0)
|
||||||
|
, m_next_sibling(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -33,11 +33,11 @@ namespace Shared {
|
|||||||
mutexThreadObjectAccessor(new Mutex(CODE_AT_LINE)),
|
mutexThreadObjectAccessor(new Mutex(CODE_AT_LINE)),
|
||||||
mutexThreadOwnerValid(new Mutex(CODE_AT_LINE)),
|
mutexThreadOwnerValid(new Mutex(CODE_AT_LINE)),
|
||||||
mutexExecutingTask(new Mutex(CODE_AT_LINE)),
|
mutexExecutingTask(new Mutex(CODE_AT_LINE)),
|
||||||
|
ptr(NULL),
|
||||||
mutexStarted(new Mutex(CODE_AT_LINE)),
|
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__);
|
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d]\n", __FILE__, __FUNCTION__, __LINE__);
|
||||||
|
|
||||||
ptr = this;
|
ptr = this;
|
||||||
MutexSafeWrapper safeMutexMasterList(&mutexMasterThreadList);
|
MutexSafeWrapper safeMutexMasterList(&mutexMasterThreadList);
|
||||||
masterThreadList[ptr]++;
|
masterThreadList[ptr]++;
|
||||||
|
@@ -379,11 +379,11 @@ namespace Shared {
|
|||||||
unsigned int millisecsBetweenExecutions,
|
unsigned int millisecsBetweenExecutions,
|
||||||
bool needTaskSignal,
|
bool needTaskSignal,
|
||||||
void *userdata, bool wantSetupAndShutdown) : BaseThread(),
|
void *userdata, bool wantSetupAndShutdown) : BaseThread(),
|
||||||
simpleTaskInterface(NULL),
|
|
||||||
overrideShutdownTask(NULL),
|
|
||||||
mutexSimpleTaskInterfaceValid(new Mutex(CODE_AT_LINE)),
|
mutexSimpleTaskInterfaceValid(new Mutex(CODE_AT_LINE)),
|
||||||
|
simpleTaskInterface(NULL),
|
||||||
mutexTaskSignaller(new Mutex(CODE_AT_LINE)),
|
mutexTaskSignaller(new Mutex(CODE_AT_LINE)),
|
||||||
mutexLastExecuteTimestamp(new Mutex(CODE_AT_LINE)) {
|
mutexLastExecuteTimestamp(new Mutex(CODE_AT_LINE)),
|
||||||
|
overrideShutdownTask(NULL) {
|
||||||
|
|
||||||
uniqueID = "SimpleTaskThread";
|
uniqueID = "SimpleTaskThread";
|
||||||
this->simpleTaskInterface = simpleTaskInterface;
|
this->simpleTaskInterface = simpleTaskInterface;
|
||||||
@@ -391,7 +391,6 @@ namespace Shared {
|
|||||||
this->executionCount = executionCount;
|
this->executionCount = executionCount;
|
||||||
this->millisecsBetweenExecutions = millisecsBetweenExecutions;
|
this->millisecsBetweenExecutions = millisecsBetweenExecutions;
|
||||||
this->needTaskSignal = needTaskSignal;
|
this->needTaskSignal = needTaskSignal;
|
||||||
this->overrideShutdownTask = NULL;
|
|
||||||
this->userdata = userdata;
|
this->userdata = userdata;
|
||||||
this->wantSetupAndShutdown = wantSetupAndShutdown;
|
this->wantSetupAndShutdown = wantSetupAndShutdown;
|
||||||
//if(this->userdata != NULL) {
|
//if(this->userdata != NULL) {
|
||||||
|
@@ -135,7 +135,8 @@ namespace Shared {
|
|||||||
// =====================================
|
// =====================================
|
||||||
Thread::Thread() : thread(NULL),
|
Thread::Thread() : thread(NULL),
|
||||||
mutexthreadAccessor(new Mutex(CODE_AT_LINE)),
|
mutexthreadAccessor(new Mutex(CODE_AT_LINE)),
|
||||||
deleteAfterExecute(false), currentState(thrsNew) {
|
currentState(thrsNew),
|
||||||
|
deleteAfterExecute(false) {
|
||||||
addThreadToList();
|
addThreadToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user