mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
This commit is contained in:
parent
2f6d0bf70f
commit
ceff716a39
2 changed files with 5 additions and 5 deletions
2
juce.h
2
juce.h
|
|
@ -194,7 +194,7 @@ END_JUCE_NAMESPACE
|
|||
#define START_JUCE_APPLICATION(AppClass) \
|
||||
int main (int argc, char* argv[]) \
|
||||
{ \
|
||||
return JUCEApplication::main (argc, argv, new AppClass()); \
|
||||
return JUCE_NAMESPACE::JUCEApplication::main (argc, argv, new AppClass()); \
|
||||
}
|
||||
|
||||
#elif JUCE_WIN32
|
||||
|
|
|
|||
|
|
@ -95,13 +95,13 @@
|
|||
#define juce_DeclareSingleton(classname, allowOnlyOneInstance) \
|
||||
\
|
||||
static classname* _singletonInstance; \
|
||||
static CriticalSection _singletonLock; \
|
||||
static JUCE_NAMESPACE::CriticalSection _singletonLock; \
|
||||
\
|
||||
static classname* getInstance() \
|
||||
{ \
|
||||
if (_singletonInstance == 0) \
|
||||
{\
|
||||
const ScopedLock sl (_singletonLock); \
|
||||
const JUCE_NAMESPACE::ScopedLock sl (_singletonLock); \
|
||||
\
|
||||
if (_singletonInstance == 0) \
|
||||
{ \
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
\
|
||||
static void deleteInstance() \
|
||||
{ \
|
||||
const ScopedLock sl (_singletonLock); \
|
||||
const JUCE_NAMESPACE::ScopedLock sl (_singletonLock); \
|
||||
if (_singletonInstance != 0) \
|
||||
{ \
|
||||
classname* const old = _singletonInstance; \
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
#define juce_ImplementSingleton(classname) \
|
||||
\
|
||||
classname* classname::_singletonInstance = 0; \
|
||||
CriticalSection classname::_singletonLock;
|
||||
JUCE_NAMESPACE::CriticalSection classname::_singletonLock;
|
||||
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue