epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge remote branch 'origin/master'

Browse Source 
* origin/master:
  change #ifndef name
  static init. problem removed
This commit is contained in:
Michael Davidsaver
2011-02-04 16:29:30 -05:00
parent 624dff139d 71cc5e625d
commit 29bbaa60f6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/misc/CDRMonitor.h
+3 -3
View File
@@ -4,8 +4,8 @@
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
#ifndef SHOWCONSTRUCTDESTRUCT_H
#define SHOWCONSTRUCTDESTRUCT_H
#ifndef CDRMONITOR_H
#define CDRMONITOR_H
#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
@@ -91,4 +91,4 @@ private:
}}
#endif /* SHOWCONSTRUCTDESTRUCT_H */
#endif /* CDRMONITOR_H */
pvDataApp/misc/StatusCreateFactory.cpp
+5 -4
View File
@@ -19,7 +19,8 @@
namespace epics { namespace pvData {
PVDATA_REFCOUNT_MONITOR_DEFINE(status);
// TODO disabled due to problem with static initialization (order)
//PVDATA_REFCOUNT_MONITOR_DEFINE(status);
class StatusImpl : public Status
{
@@ -28,17 +29,17 @@ class StatusImpl : public Status
StatusImpl(StatusType type, String message) :
m_type(type), m_message(message)
{
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(status);
// PVDATA_REFCOUNT_MONITOR_CONSTRUCT(status);
}
StatusImpl(StatusType type, String message, String stackDump) :
m_type(type), m_message(message), m_stackDump(stackDump)
{
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(status);
//PVDATA_REFCOUNT_MONITOR_CONSTRUCT(status);
}
virtual ~StatusImpl() {
PVDATA_REFCOUNT_MONITOR_DESTRUCT(status);
//PVDATA_REFCOUNT_MONITOR_DESTRUCT(status);
}
virtual StatusType getType()