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

remove usage of NoDefaultMethods

Browse Source
This commit is contained in:
Michael Davidsaver
2018-12-04 14:14:26 -08:00
parent 09354041dc
commit 3b4a52a360
11 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/client/pv/pvAccess.h
View File

@@ -101,7 +101,8 @@ public:
/**
* Scope lock.
*/
class epicsShareClass ScopedLock : private epics::pvData::NoDefaultMethods {
class epicsShareClass ScopedLock {
EPICS_NOT_COPYABLE(ScopedLock)
public:
explicit ScopedLock(Lockable::shared_pointer const & li)
@@ -179,7 +180,7 @@ private:
/**
* Base interface for all channel requests (aka. Operations).
*/
class epicsShareClass ChannelRequest : public virtual Destroyable, public Lockable, private epics::pvData::NoDefaultMethods {
class epicsShareClass ChannelRequest : public virtual Destroyable, public Lockable {
public:
POINTER_DEFINITIONS(ChannelRequest);
@@ -211,8 +212,7 @@ public:
virtual void lastRequest() = 0;
private:
ChannelRequest(const ChannelRequest&);
ChannelRequest& operator=(const ChannelRequest&);
EPICS_NOT_COPYABLE(ChannelRequest)
};
/**
@@ -376,11 +376,13 @@ public:
/**
*
*/
class epicsShareClass ChannelFind : public Destroyable, private epics::pvData::NoDefaultMethods {
class epicsShareClass ChannelFind : public Destroyable {
EPICS_NOT_COPYABLE(ChannelFind)
public:
POINTER_DEFINITIONS(ChannelFind);
typedef ChannelFindRequester requester_type;
ChannelFind() {}
virtual ~ChannelFind() {}
virtual std::tr1::shared_ptr<ChannelProvider> getChannelProvider() = 0;
@@ -833,8 +835,9 @@ class ChannelRequester;
*/
class epicsShareClass Channel :
public Requester,
public Destroyable,
private epics::pvData::NoDefaultMethods {
public Destroyable
{
EPICS_NOT_COPYABLE(Channel)
public:
POINTER_DEFINITIONS(Channel);
typedef ChannelRequester requester_type;
@@ -1154,10 +1157,9 @@ enum FlushStrategy {
*
* Uniquely configurable (via ChannelProviderFactory::newInstance(Configuration*)
*/
class epicsShareClass ChannelProvider : public Destroyable, private epics::pvData::NoDefaultMethods
class epicsShareClass ChannelProvider : public Destroyable
{
ChannelProvider(const ChannelProvider&);
ChannelProvider& operator=(const ChannelProvider&);
EPICS_NOT_COPYABLE(ChannelProvider)
public:
POINTER_DEFINITIONS(ChannelProvider);
@@ -1246,10 +1248,12 @@ public:
/**
* <code>ChanneProvider</code> factory interface.
*/
class epicsShareClass ChannelProviderFactory : private epics::pvData::NoDefaultMethods {
class epicsShareClass ChannelProviderFactory {
EPICS_NOT_COPYABLE(ChannelProviderFactory)
public:
POINTER_DEFINITIONS(ChannelProviderFactory);
ChannelProviderFactory() {}
virtual ~ChannelProviderFactory() {}
/**

3
src/pva/pv/pvaVersion.h
View File

@@ -33,7 +33,8 @@
namespace epics {
namespace pvAccess {
class epicsShareClass Version : public epics::pvData::NoDefaultMethods {
class epicsShareClass Version {
EPICS_NOT_COPYABLE(Version)
public:
/**
* Default constructor.

3
src/remote/pv/blockingUDP.h
View File

@@ -41,11 +41,12 @@ class BlockingUDPConnector;
enum InetAddressType { inetAddressType_all, inetAddressType_unicast, inetAddressType_broadcast_multicast };
class BlockingUDPTransport : public epics::pvData::NoDefaultMethods,
class BlockingUDPTransport :
public Transport,
public TransportSendControl,
public epicsThreadRunable
{
EPICS_NOT_COPYABLE(BlockingUDPTransport)
public:
POINTER_DEFINITIONS(BlockingUDPTransport);

4
src/remote/pv/security.h
View File

@@ -414,9 +414,9 @@ public:
}
};
class epicsShareClass SecurityPluginRegistry :
private epics::pvData::NoDefaultMethods
class epicsShareClass SecurityPluginRegistry
{
EPICS_NOT_COPYABLE(SecurityPluginRegistry)
public:
static SecurityPluginRegistry& instance()

4
src/remote/pv/securityImpl.h
View File

@@ -10,9 +10,9 @@ namespace pvAccess {
class AuthNZHandler :
public ResponseHandler,
private epics::pvData::NoDefaultMethods
public ResponseHandler
{
EPICS_NOT_COPYABLE(AuthNZHandler)
public:
AuthNZHandler(Context* context) :
ResponseHandler(context, "authNZ message")

3
src/remote/pv/serializationHelper.h
View File

@@ -20,7 +20,8 @@
namespace epics {
namespace pvAccess {
class epicsShareClass SerializationHelper : public epics::pvData::NoDefaultMethods {
class epicsShareClass SerializationHelper {
EPICS_NOT_COPYABLE(SerializationHelper)
public:
static epics::pvData::PVDataCreatePtr _pvDataCreate;

26
src/remoteClient/clientContextImpl.cpp
View File

@@ -2455,6 +2455,7 @@ public:
class AbstractClientResponseHandler : public ResponseHandler {
EPICS_NOT_COPYABLE(AbstractClientResponseHandler)
protected:
const ClientContextImpl::weak_pointer _context;
public:
@@ -2466,7 +2467,7 @@ public:
}
};
class NoopResponse : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class NoopResponse : public AbstractClientResponseHandler {
public:
NoopResponse(ClientContextImpl::shared_pointer const & context, string const & description) :
AbstractClientResponseHandler(context, description)
@@ -2478,7 +2479,7 @@ public:
};
class ResponseRequestHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class ResponseRequestHandler : public AbstractClientResponseHandler {
public:
ResponseRequestHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Data response")
@@ -2509,7 +2510,7 @@ public:
};
class MultipleResponseRequestHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class MultipleResponseRequestHandler : public AbstractClientResponseHandler {
public:
MultipleResponseRequestHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Multiple data response")
@@ -2547,7 +2548,7 @@ public:
}
};
class SearchResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class SearchResponseHandler : public AbstractClientResponseHandler {
public:
SearchResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Search response")
@@ -2610,7 +2611,7 @@ public:
}
};
class SearchHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class SearchHandler : public AbstractClientResponseHandler {
public:
SearchHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Search")
@@ -2699,7 +2700,7 @@ public:
}
};
class BeaconResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class BeaconResponseHandler : public AbstractClientResponseHandler {
public:
BeaconResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Beacon")
@@ -2769,7 +2770,7 @@ public:
}
};
class ClientConnectionValidationHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class ClientConnectionValidationHandler : public AbstractClientResponseHandler {
public:
ClientConnectionValidationHandler(ClientContextImpl::shared_pointer context) :
AbstractClientResponseHandler(context, "Connection validation")
@@ -2809,7 +2810,7 @@ public:
}
};
class ClientConnectionValidatedHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class ClientConnectionValidatedHandler : public AbstractClientResponseHandler {
public:
ClientConnectionValidatedHandler(ClientContextImpl::shared_pointer context) :
AbstractClientResponseHandler(context, "Connection validated")
@@ -2830,7 +2831,7 @@ public:
}
};
class MessageHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class MessageHandler : public AbstractClientResponseHandler {
public:
MessageHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Message")
@@ -2865,7 +2866,7 @@ public:
}
};
class CreateChannelHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class CreateChannelHandler : public AbstractClientResponseHandler {
public:
CreateChannelHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Create channel")
@@ -2915,7 +2916,7 @@ public:
};
class DestroyChannelHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
class DestroyChannelHandler : public AbstractClientResponseHandler {
public:
DestroyChannelHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Destroy channel")
@@ -2945,7 +2946,8 @@ public:
* PVA response handler - main handler which dispatches responses to appripriate handlers.
* @author <a href="mailto:matej.sekoranjaATcosylab.com">Matej Sekoranja</a>
*/
class ClientResponseHandler : public ResponseHandler, private epics::pvData::NoDefaultMethods {
class ClientResponseHandler : public ResponseHandler {
EPICS_NOT_COPYABLE(ClientResponseHandler)
private:
/**

2
src/utils/configuration.cpp
View File

@@ -26,6 +26,8 @@ namespace pvAccess {
using namespace epics::pvData;
using namespace std;
Configuration::~Configuration() {}
bool Configuration::getPropertyAsBoolean(const std::string &name, const bool defaultValue) const
{
string value = getPropertyAsString(name, defaultValue ? "1" : "0");

3
src/utils/logger.cpp
View File

@@ -68,7 +68,8 @@ bool pvAccessIsLoggable(pvAccessLogLevel level)
namespace {
class FileLogger : public NoDefaultMethods {
class FileLogger {
EPICS_NOT_COPYABLE(FileLogger)
public:
FileLogger(std::string const & name) {
logFile.open(name.data(), ios::app);

23
src/utils/pv/configuration.h
View File

@@ -42,15 +42,14 @@ class ConfigurationStack;
/**
* Configuration
*/
class epicsShareClass Configuration : private epics::pvData::NoDefaultMethods
class epicsShareClass Configuration
{
EPICS_NOT_COPYABLE(Configuration)
public:
POINTER_DEFINITIONS(Configuration);
/**
* Destructor.
*/
virtual ~Configuration() {};
Configuration() {}
virtual ~Configuration() =0;
/**
* Get the environment variable specified by name or return default value
* if it does not exist.
@@ -202,14 +201,13 @@ private:
/**
* Configuration provider.
*/
class epicsShareClass ConfigurationProvider : private epics::pvData::NoDefaultMethods
class epicsShareClass ConfigurationProvider
{
EPICS_NOT_COPYABLE(ConfigurationProvider)
public:
POINTER_DEFINITIONS(ConfigurationProvider);
/**
* Destructor.
*/
virtual ~ConfigurationProvider() {};
ConfigurationProvider() {}
virtual ~ConfigurationProvider() {}
/**
* Return configuration specified by name.
*
@@ -234,7 +232,7 @@ public:
/**
* Destructor. Note: Registered configurations will be deleted!!
*/
~ConfigurationProviderImpl() {}
virtual ~ConfigurationProviderImpl() {}
Configuration::shared_pointer getConfiguration(const std::string &name);
void registerConfiguration(const std::string &name, Configuration::shared_pointer const & configuration);
private:
@@ -245,8 +243,9 @@ private:
/**
* Configuration factory.
*/
class epicsShareClass ConfigurationFactory : private epics::pvData::NoDefaultMethods
class epicsShareClass ConfigurationFactory
{
EPICS_NOT_COPYABLE(ConfigurationFactory)
public:
POINTER_DEFINITIONS(ConfigurationFactory);

3
src/utils/pv/introspectionRegistry.h
View File

@@ -42,7 +42,8 @@ typedef std::map<const short,epics::pvData::FieldConstPtr> registryMap_t;
* Registry is used to cache introspection interfaces to minimize network traffic.
* @author gjansa
*/
class IntrospectionRegistry : public epics::pvData::NoDefaultMethods {
class IntrospectionRegistry {
EPICS_NOT_COPYABLE(IntrospectionRegistry)
public:
IntrospectionRegistry();
virtual ~IntrospectionRegistry();