livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corect merge issues.

meow-7.2.2
Nicky 2015-05-05 14:54:26 +02:00
parent 87eb71b987
commit 2b0c80ec99
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llprocessor.cpp
View File

@ -227,7 +227,6 @@ namespace
}
return "Unknown";
}
#endif // </FS:ND>
} // end unnamed namespace
// The base class for implementations.

4
indra/llcommon/llthread.h
View File

@ -45,7 +45,7 @@ class LL_COMMON_API LLThread
{
private:
friend class LLMutex;
static uintptr_t sIDIter;
static U32 sIDIter;
public:
typedef enum e_thread_status
@ -62,7 +62,7 @@ public:
bool isQuitting() const { return (QUITTING == mStatus); }
bool isStopped() const { return (STOPPED == mStatus); }
static uintptr_t currentID(); // Return ID of current thread
static U32 currentID(); // Return ID of current thread
static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure.
public: