From e6c521bfb9d3c941c761b89ecdcd50f60b068807 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Wed, 2 Feb 2011 20:34:56 +0100
Subject: [PATCH 1/2] static init. problem removed

---
 pvDataApp/misc/StatusCreateFactory.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pvDataApp/misc/StatusCreateFactory.cpp b/pvDataApp/misc/StatusCreateFactory.cpp
index 1df4157..0645e28 100644
--- a/pvDataApp/misc/StatusCreateFactory.cpp
+++ b/pvDataApp/misc/StatusCreateFactory.cpp
@@ -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()

From 71cc5e625d7f8b09e1a64d1a48fb531e0d9029c9 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Thu, 3 Feb 2011 09:16:11 -0500
Subject: [PATCH 2/2] change #ifndef name

---
 pvDataApp/misc/CDRMonitor.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pvDataApp/misc/CDRMonitor.h b/pvDataApp/misc/CDRMonitor.h
index cd3feb1..2ad7d22 100644
--- a/pvDataApp/misc/CDRMonitor.h
+++ b/pvDataApp/misc/CDRMonitor.h
@@ -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 */