From 60f6646520e0b429bc454d854eecb6093e7657c8 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 1 Nov 2017 16:07:18 -0500
Subject: [PATCH] more compat

---
 p2pApp/moncache.cpp | 5 +++++
 p2pApp/weakmap.h    | 3 +++
 p2pApp/weakset.h    | 3 +++
 pdbApp/pdbgroup.h   | 1 +
 4 files changed, 12 insertions(+)

diff --git a/p2pApp/moncache.cpp b/p2pApp/moncache.cpp
index 6e5a850..0dcb88f 100644
--- a/p2pApp/moncache.cpp
+++ b/p2pApp/moncache.cpp
@@ -2,6 +2,11 @@
 #include <epicsAtomic.h>
 #include <errlog.h>
 
+#include <epicsMutex.h>
+#include <epicsTimer.h>
+
+#include <pv/pvAccess.h>
+
 #define epicsExportSharedSymbols
 #include "helper.h"
 #include "pva2pva.h"
diff --git a/p2pApp/weakmap.h b/p2pApp/weakmap.h
index 1a67cbc..90ecafd 100644
--- a/p2pApp/weakmap.h
+++ b/p2pApp/weakmap.h
@@ -111,10 +111,13 @@ private:
 public:
     //! Construct a new empty set
     weak_value_map() :m_data(new data) {}
+
+private:
     //! Not copyable
     weak_value_map(const weak_value_map& O);
     //! Not copyable
     weak_value_map& operator=(const weak_value_map& O);
+public:
 
     //! exchange the two sets.
     //! @warning Not thread safe (exchanges mutexes as well)
diff --git a/p2pApp/weakset.h b/p2pApp/weakset.h
index 079fce3..7d9e135 100644
--- a/p2pApp/weakset.h
+++ b/p2pApp/weakset.h
@@ -132,10 +132,13 @@ private:
 public:
     //! Construct a new empty set
     weak_set() :m_data(new data) {}
+
+private:
     //! Not copyable
     weak_set(const weak_set& O);
     //! Not copyable
     weak_set& operator=(const weak_set& O);
+public:
 
     //! exchange the two sets.
     //! @warning Not thread safe (exchanges mutexes as well)
diff --git a/pdbApp/pdbgroup.h b/pdbApp/pdbgroup.h
index f6c6003..0b667a7 100644
--- a/pdbApp/pdbgroup.h
+++ b/pdbApp/pdbgroup.h
@@ -148,6 +148,7 @@ struct epicsShareClass PDBGroupChannel : public BaseChannel,
 struct PDBGroupPut : public epics::pvAccess::ChannelPut,
         public std::tr1::enable_shared_from_this<PDBGroupPut>
 {
+    POINTER_DEFINITIONS(PDBGroupPut);
     typedef epics::pvAccess::ChannelPutRequester requester_t;
     PDBGroupChannel::shared_pointer channel;
     requester_type::weak_pointer requester;