From 770e63b8daa3b47e7f4809aae3688c3766ec1448 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Mon, 21 May 2012 21:11:20 +0200
Subject: [PATCH] removed BitSetPtr due to possible 4.6.1 gcc problem

---
 pvDataApp/misc/bitSet.cpp   | 4 ++--
 pvDataApp/misc/bitSet.h     | 4 +---
 pvDataApp/monitor/monitor.h | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pvDataApp/misc/bitSet.cpp b/pvDataApp/misc/bitSet.cpp
index 2903a05..ce43e78 100644
--- a/pvDataApp/misc/bitSet.cpp
+++ b/pvDataApp/misc/bitSet.cpp
@@ -14,9 +14,9 @@
 namespace epics { namespace pvData {
  
     PVDATA_REFCOUNT_MONITOR_DEFINE(bitSet);
-    BitSetPtr BitSet::create(uint32 nbits)
+    BitSet::shared_pointer BitSet::create(uint32 nbits)
     {
-        return BitSetPtr(new BitSet(nbits));
+        return BitSet::shared_pointer(new BitSet(nbits));
     }
     
     BitSet::BitSet() : words(0), wordsLength(0), wordsInUse(0) {
diff --git a/pvDataApp/misc/bitSet.h b/pvDataApp/misc/bitSet.h
index 65cf345..0d21828 100644
--- a/pvDataApp/misc/bitSet.h
+++ b/pvDataApp/misc/bitSet.h
@@ -36,12 +36,10 @@ namespace epics { namespace pvData {
      *
      * Based on Java implementation.
      */
-    class BitSet;
-    typedef std::tr1::shared_ptr<BitSet> BitSetPtr;
     class BitSet : public Serializable {
     public:
         POINTER_DEFINITIONS(BitSet);
-        static BitSetPtr create(uint32 nbits);
+        static BitSet::shared_pointer create(uint32 nbits);
         /**
          * Creates a new bit set. All bits are initially {@code false}.
          */
diff --git a/pvDataApp/monitor/monitor.h b/pvDataApp/monitor/monitor.h
index 4425f67..cf88995 100644
--- a/pvDataApp/monitor/monitor.h
+++ b/pvDataApp/monitor/monitor.h
@@ -33,14 +33,14 @@ class MonitorElement {
     MonitorElement(){}
     MonitorElement(PVStructurePtr &pvStructurePtr);
     PVStructurePtr pvStructurePtr;
-    BitSetPtr changedBitSet;
-    BitSetPtr overrunBitSet;
+    BitSet::shared_pointer changedBitSet;
+    BitSet::shared_pointer overrunBitSet;
 };
 
 MonitorElement::MonitorElement(PVStructurePtr &pvStructurePtr)
 : pvStructurePtr(pvStructurePtr),
-  changedBitSet(BitSetPtr(BitSet::create(pvStructurePtr->getNumberFields()))),
-  overrunBitSet(BitSetPtr(BitSet::create(pvStructurePtr->getNumberFields())))
+  changedBitSet(BitSet::create(pvStructurePtr->getNumberFields())),
+  overrunBitSet(BitSet::create(pvStructurePtr->getNumberFields()))
 {
 }