more compat
This commit is contained in:
@ -2,6 +2,11 @@
|
|||||||
#include <epicsAtomic.h>
|
#include <epicsAtomic.h>
|
||||||
#include <errlog.h>
|
#include <errlog.h>
|
||||||
|
|
||||||
|
#include <epicsMutex.h>
|
||||||
|
#include <epicsTimer.h>
|
||||||
|
|
||||||
|
#include <pv/pvAccess.h>
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
#include "pva2pva.h"
|
#include "pva2pva.h"
|
||||||
|
@ -111,10 +111,13 @@ private:
|
|||||||
public:
|
public:
|
||||||
//! Construct a new empty set
|
//! Construct a new empty set
|
||||||
weak_value_map() :m_data(new data) {}
|
weak_value_map() :m_data(new data) {}
|
||||||
|
|
||||||
|
private:
|
||||||
//! Not copyable
|
//! Not copyable
|
||||||
weak_value_map(const weak_value_map& O);
|
weak_value_map(const weak_value_map& O);
|
||||||
//! Not copyable
|
//! Not copyable
|
||||||
weak_value_map& operator=(const weak_value_map& O);
|
weak_value_map& operator=(const weak_value_map& O);
|
||||||
|
public:
|
||||||
|
|
||||||
//! exchange the two sets.
|
//! exchange the two sets.
|
||||||
//! @warning Not thread safe (exchanges mutexes as well)
|
//! @warning Not thread safe (exchanges mutexes as well)
|
||||||
|
@ -132,10 +132,13 @@ private:
|
|||||||
public:
|
public:
|
||||||
//! Construct a new empty set
|
//! Construct a new empty set
|
||||||
weak_set() :m_data(new data) {}
|
weak_set() :m_data(new data) {}
|
||||||
|
|
||||||
|
private:
|
||||||
//! Not copyable
|
//! Not copyable
|
||||||
weak_set(const weak_set& O);
|
weak_set(const weak_set& O);
|
||||||
//! Not copyable
|
//! Not copyable
|
||||||
weak_set& operator=(const weak_set& O);
|
weak_set& operator=(const weak_set& O);
|
||||||
|
public:
|
||||||
|
|
||||||
//! exchange the two sets.
|
//! exchange the two sets.
|
||||||
//! @warning Not thread safe (exchanges mutexes as well)
|
//! @warning Not thread safe (exchanges mutexes as well)
|
||||||
|
@ -148,6 +148,7 @@ struct epicsShareClass PDBGroupChannel : public BaseChannel,
|
|||||||
struct PDBGroupPut : public epics::pvAccess::ChannelPut,
|
struct PDBGroupPut : public epics::pvAccess::ChannelPut,
|
||||||
public std::tr1::enable_shared_from_this<PDBGroupPut>
|
public std::tr1::enable_shared_from_this<PDBGroupPut>
|
||||||
{
|
{
|
||||||
|
POINTER_DEFINITIONS(PDBGroupPut);
|
||||||
typedef epics::pvAccess::ChannelPutRequester requester_t;
|
typedef epics::pvAccess::ChannelPutRequester requester_t;
|
||||||
PDBGroupChannel::shared_pointer channel;
|
PDBGroupChannel::shared_pointer channel;
|
||||||
requester_type::weak_pointer requester;
|
requester_type::weak_pointer requester;
|
||||||
|
Reference in New Issue
Block a user