Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'curlthreading2' into curlthreading3

Browse Source
This commit is contained in:
Aleric Inglewood
2012-08-07 05:21:52 +02:00
parent 95083e846b 2fbf6b732e
commit 8646abb18b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcommon/llthread.cpp
View File

@@ -29,6 +29,11 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#ifdef __GNUC__
// Generate code for inlines from llthread.h (needed for is_main_thread()).
#pragma implementation "llthread.h"
#endif
#include "linden_common.h" #include "linden_common.h"
#include "llapr.h" #include "llapr.h"

8
indra/llcommon/llthread.h
View File

@@ -33,6 +33,12 @@
#ifndef LL_LLTHREAD_H #ifndef LL_LLTHREAD_H
#define LL_LLTHREAD_H #define LL_LLTHREAD_H
#ifdef __GNUC__
// Needed for is_main_thread() when compiling with optimization (relwithdebinfo).
// It doesn't hurt to just always specify it though.
#pragma interface
#endif
#include "llapp.h" #include "llapp.h"
#include "llapr.h" #include "llapr.h"
#include "llmemory.h" #include "llmemory.h"
@@ -308,7 +314,7 @@ private:
LLMutexBase* mMutex; LLMutexBase* mMutex;
}; };
class AIRWLock class LL_COMMON_API AIRWLock
{ {
public: public:
AIRWLock(LLAPRPool& parent = LLThread::tldata().mRootPool) : AIRWLock(LLAPRPool& parent = LLThread::tldata().mRootPool) :