Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2461 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
0c897f7a58
4 changed files with 16 additions and 22 deletions
  1. +13
    -11
      common/JackAtomicArrayState.h
  2. +1
    -0
      common/JackAtomicState.h
  3. +1
    -3
      common/JackGlobals.cpp
  4. +1
    -8
      common/JackShmMem.h

+ 13
- 11
common/JackAtomicArrayState.h View File

@@ -39,20 +39,21 @@ struct AtomicArrayCounter
scounter; scounter;
UInt32 fLongVal; UInt32 fLongVal;
}info; }info;
AtomicArrayCounter()
{
info.fLongVal = 0;
}


AtomicArrayCounter()
{
info.fLongVal = 0;
AtomicArrayCounter(volatile const AtomicArrayCounter& obj)
{
info.fLongVal = obj.info.fLongVal;
} }


AtomicArrayCounter(volatile const AtomicArrayCounter& obj)
{
info.fLongVal = obj.info.fLongVal;
}
AtomicArrayCounter(volatile AtomicArrayCounter& obj)
{
info.fLongVal = obj.info.fLongVal;
}
AtomicArrayCounter(volatile AtomicArrayCounter& obj)
{
info.fLongVal = obj.info.fLongVal;
}


AtomicArrayCounter& operator=(volatile AtomicArrayCounter& obj) AtomicArrayCounter& operator=(volatile AtomicArrayCounter& obj)
{ {
@@ -65,6 +66,7 @@ struct AtomicArrayCounter
info.fLongVal = obj.info.fLongVal; info.fLongVal = obj.info.fLongVal;
return *this; return *this;
} }
}; };


#define Counter1(e) (e).info.fLongVal #define Counter1(e) (e).info.fLongVal


+ 1
- 0
common/JackAtomicState.h View File

@@ -50,6 +50,7 @@ struct AtomicCounter
{ {
info.fLongVal = obj.info.fLongVal; info.fLongVal = obj.info.fLongVal;
} }
AtomicCounter(volatile AtomicCounter& obj) AtomicCounter(volatile AtomicCounter& obj)
{ {
info.fLongVal = obj.info.fLongVal; info.fLongVal = obj.info.fLongVal;


+ 1
- 3
common/JackGlobals.cpp View File

@@ -30,7 +30,6 @@ jack_tls_key gRealTime;
jack_tls_key g_key_log_function; jack_tls_key g_key_log_function;


// Initialisation at library load time // Initialisation at library load time

#ifdef WIN32 #ifdef WIN32


#ifdef __cplusplus #ifdef __cplusplus
@@ -90,6 +89,7 @@ static void jack_init()
if (!g_key_log_function_initialized) if (!g_key_log_function_initialized)
g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function); g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function);
} }

__attribute__ ((destructor)) __attribute__ ((destructor))
static void jack_uninit() static void jack_uninit()
{ {
@@ -104,6 +104,4 @@ static void jack_uninit()
} }
} }




#endif #endif

+ 1
- 8
common/JackShmMem.h View File

@@ -109,14 +109,7 @@ class EXPORT JackShmMem
void operator delete(void* p); void operator delete(void* p);


JackShmMem(); JackShmMem();
/*
{
fInfo.index = gInfo.index;
fInfo.attached_at = gInfo.attached_at;
fInfo.size = gInfo.size;
}
*/

virtual ~JackShmMem() virtual ~JackShmMem()
{} {}




Loading…
Cancel
Save