From e4fed2fa1b12597e7ee8537db0d8ba8776a42543 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 6 Jan 2016 13:52:24 +0100 Subject: [PATCH] Fix copy constructor & assignment operator warning in FairMQChannel Fix Weffc++ warnings - Add missing copy constructors and assignment operators . - Hide the warning from FairMQStateMachine.h where it is produced by boost and/or is intended. - Some code cleanup. --- fairmq/FairMQChannel.cxx | 41 ++++++++++++++++++++++ fairmq/FairMQChannel.h | 6 ++++ fairmq/FairMQDevice.h | 8 ++--- fairmq/FairMQStateMachine.h | 16 +++++++++ fairmq/devices/BaseDeserializationPolicy.h | 23 +++++------- fairmq/devices/BaseProcessorTaskPolicy.h | 28 +++++++-------- fairmq/devices/BaseSerializationPolicy.h | 15 ++++---- fairmq/devices/BaseSinkPolicy.h | 16 ++++----- fairmq/devices/BaseSourcePolicy.h | 14 ++++---- fairmq/devices/GenericMerger.h | 3 +- fairmq/devices/GenericSampler.tpl | 1 + fairmq/nanomsg/FairMQMessageNN.h | 6 ++-- fairmq/nanomsg/FairMQPollerNN.h | 6 ++-- fairmq/nanomsg/FairMQSocketNN.h | 6 ++-- fairmq/options/FairProgOptions.cxx | 12 ++++--- fairmq/options/FairProgOptions.h | 8 ++--- fairmq/options/FairProgOptionsHelper.h | 6 ++-- fairmq/tools/runSimpleMQStateMachine.h | 4 --- fairmq/zeromq/FairMQContextZMQ.h | 6 ++-- fairmq/zeromq/FairMQPollerZMQ.h | 6 ++-- fairmq/zeromq/FairMQSocketZMQ.h | 6 ++-- 21 files changed, 133 insertions(+), 104 deletions(-) diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx index 9dd84fe3..e6b69d13 100644 --- a/fairmq/FairMQChannel.cxx +++ b/fairmq/FairMQChannel.cxx @@ -63,6 +63,47 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str { } +FairMQChannel::FairMQChannel(const FairMQChannel& chan) + : fType(chan.fType) + , fMethod(chan.fMethod) + , fAddress(chan.fAddress) + , fSndBufSize(chan.fSndBufSize) + , fRcvBufSize(chan.fRcvBufSize) + , fRateLogging(chan.fRateLogging) + , fSocket(nullptr) + , fChannelName(chan.fChannelName) + , fIsValid(false) + , fPoller(nullptr) + , fCmdSocket(nullptr) + , fTransportFactory(nullptr) + , fNoBlockFlag(chan.fNoBlockFlag) + , fSndMoreFlag(chan.fSndMoreFlag) + , fSndTimeoutInMs(chan.fSndTimeoutInMs) + , fRcvTimeoutInMs(chan.fRcvTimeoutInMs) +{} + +FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan) +{ + fType = chan.fType; + fMethod = chan.fMethod; + fAddress = chan.fAddress; + fSndBufSize = chan.fSndBufSize; + fRcvBufSize = chan.fRcvBufSize; + fRateLogging = chan.fRateLogging; + fSocket = nullptr; + fChannelName = chan.fChannelName; + fIsValid = false; + fPoller = nullptr; + fCmdSocket = nullptr; + fTransportFactory = nullptr; + fNoBlockFlag = chan.fNoBlockFlag; + fSndMoreFlag = chan.fSndMoreFlag; + fSndTimeoutInMs = chan.fSndTimeoutInMs; + fRcvTimeoutInMs = chan.fRcvTimeoutInMs; + + return *this; +} + string FairMQChannel::GetType() const { try diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index dc8491d3..e8490b50 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -41,6 +41,12 @@ class FairMQChannel /// @param address Network address to bind/connect to (e.g. "tcp://127.0.0.1:5555" or "ipc://abc") FairMQChannel(const std::string& type, const std::string& method, const std::string& address); + /// Copy Constructor + FairMQChannel(const FairMQChannel&); + + /// Assignment operator + FairMQChannel& operator=(const FairMQChannel&); + /// Default destructor virtual ~FairMQChannel(); diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h index ba86b5b5..3a819990 100644 --- a/fairmq/FairMQDevice.h +++ b/fairmq/FairMQDevice.h @@ -45,6 +45,10 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable /// Default constructor FairMQDevice(); + /// Copy constructor (disabled) + FairMQDevice(const FairMQDevice&) = delete; + /// Assignment operator (disabled) + FairMQDevice operator=(const FairMQDevice&) = delete; /// Default destructor virtual ~FairMQDevice(); @@ -173,10 +177,6 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable /// Signal handler void SignalHandler(int signal); bool fCatchingSignals; - - /// Copy Constructor - FairMQDevice(const FairMQDevice&); - FairMQDevice operator=(const FairMQDevice&); }; #endif /* FAIRMQDEVICE_H_ */ diff --git a/fairmq/FairMQStateMachine.h b/fairmq/FairMQStateMachine.h index 3d240aa0..39373819 100644 --- a/fairmq/FairMQStateMachine.h +++ b/fairmq/FairMQStateMachine.h @@ -57,6 +57,15 @@ struct internal_IDLE { std::string name() const { return "internal_IDLE" struct END { std::string name() const { return "END"; } }; struct ERROR_FOUND { std::string name() const { return "ERROR_FOUND"; } }; +// deactivate the warning for non-virtual destructor thrown in the boost library +#if defined(__clang__) +_Pragma("clang diagnostic push") +_Pragma("clang diagnostic ignored \"-Wnon-virtual-dtor\"") +#elif defined(__GNUC__) || defined(__GNUG__) +_Pragma("GCC diagnostic push") +_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") +#endif + // defining the boost MSM state machine struct FairMQFSM_ : public msm::front::state_machine_def { @@ -459,6 +468,13 @@ struct FairMQFSM_ : public msm::front::state_machine_def std::atomic fState; }; +// reactivate the warning for non-virtual destructor +#if defined(__clang__) +_Pragma("clang diagnostic pop") +#elif defined(__GNUC__) || defined(__GNUG__) +_Pragma("GCC diagnostic pop") +#endif + typedef msm::back::state_machine FairMQFSM; } // namespace FairMQFSM diff --git a/fairmq/devices/BaseDeserializationPolicy.h b/fairmq/devices/BaseDeserializationPolicy.h index e84ff34e..74efc26c 100644 --- a/fairmq/devices/BaseDeserializationPolicy.h +++ b/fairmq/devices/BaseDeserializationPolicy.h @@ -6,34 +6,28 @@ */ #ifndef BASEDESERIALIZATIONPOLICY_H -#define BASEDESERIALIZATIONPOLICY_H - +#define BASEDESERIALIZATIONPOLICY_H #include "FairMQMessage.h" // c++11 code #include - - // CRTP base class template class BaseDeserializationPolicy { -public: - BaseDeserializationPolicy() - {} + public: + BaseDeserializationPolicy() {} - virtual ~BaseDeserializationPolicy() - {} + virtual ~BaseDeserializationPolicy() {} template - auto DeserializeMsg(FairMQMessage* msg)-> decltype(static_cast(this)->DeserializeMsg(msg) ) + auto DeserializeMsg(FairMQMessage* msg)-> decltype(static_cast(this)->DeserializeMsg(msg)) { - static_assert(std::is_same{}, "BaseDeserializationPolicy::DeserializeMsg hack broken"); - return static_cast(this)->DeserializeMsg(msg); + static_assert(std::is_same{}, "BaseDeserializationPolicy::DeserializeMsg hack broken"); + return static_cast(this)->DeserializeMsg(msg); } - }; @@ -57,5 +51,4 @@ public: };*/ -#endif /* BASEDESERIALIZATIONPOLICY_H */ - +#endif /* BASEDESERIALIZATIONPOLICY_H */ diff --git a/fairmq/devices/BaseProcessorTaskPolicy.h b/fairmq/devices/BaseProcessorTaskPolicy.h index ce4577c6..150fef38 100644 --- a/fairmq/devices/BaseProcessorTaskPolicy.h +++ b/fairmq/devices/BaseProcessorTaskPolicy.h @@ -6,7 +6,7 @@ */ #ifndef BASEPROCESSORTASKPOLICY_H -#define BASEPROCESSORTASKPOLICY_H +#define BASEPROCESSORTASKPOLICY_H #include @@ -14,31 +14,27 @@ template class BaseProcessorTaskPolicy { -public: - BaseProcessorTaskPolicy() - {} + public: + BaseProcessorTaskPolicy() {} - virtual ~BaseProcessorTaskPolicy() - {} + virtual ~BaseProcessorTaskPolicy() {} template - auto GetOutputData() -> decltype(static_cast(this)->GetOutputData() ) + auto GetOutputData() -> decltype(static_cast(this)->GetOutputData()) { - static_assert(std::is_same{}, "BaseProcessorTaskPolicy::GetOutputData hack broken"); - return static_cast(this)->GetOutputData(); + static_assert(std::is_same{}, "BaseProcessorTaskPolicy::GetOutputData hack broken"); + return static_cast(this)->GetOutputData(); } template - auto ExecuteTask(CONTAINER_TYPE container) -> decltype( static_cast(this)->ExecuteTask(container) ) + auto ExecuteTask(CONTAINER_TYPE container) -> decltype( static_cast(this)->ExecuteTask(container)) { - static_assert(std::is_same{}, "BaseProcessorTaskPolicy::ExecuteTask hack broken"); - return static_cast(this)->ExecuteTask(container); + static_assert(std::is_same{}, "BaseProcessorTaskPolicy::ExecuteTask hack broken"); + return static_cast(this)->ExecuteTask(container); } - - }; - /* +/* // c++14 code only // CRTP base class @@ -65,5 +61,5 @@ public: }; */ -#endif /* BASEPROCESSORTASKPOLICY_H */ +#endif /* BASEPROCESSORTASKPOLICY_H */ diff --git a/fairmq/devices/BaseSerializationPolicy.h b/fairmq/devices/BaseSerializationPolicy.h index 88851498..a6a10a70 100644 --- a/fairmq/devices/BaseSerializationPolicy.h +++ b/fairmq/devices/BaseSerializationPolicy.h @@ -6,7 +6,7 @@ */ #ifndef BASESERIALIZATIONPOLICY_H -#define BASESERIALIZATIONPOLICY_H +#define BASESERIALIZATIONPOLICY_H #include "FairMQMessage.h" @@ -15,12 +15,10 @@ template class BaseSerializationPolicy { -public: - BaseSerializationPolicy() - {} + public: + BaseSerializationPolicy() {} - virtual ~BaseSerializationPolicy() - {} + virtual ~BaseSerializationPolicy() {} template auto SerializeMsg(CONTAINER_TYPE container) -> decltype(static_cast(this)->SerializeMsg(container) ) @@ -35,10 +33,9 @@ public: static_assert(std::is_same{}, "BaseSerializationPolicy::SetMessage hack broken"); return static_cast(this)->SetMessage(msg); } - }; - /* +/* // CRTP base class // c++14 code template @@ -64,5 +61,5 @@ public: }; */ -#endif /* BASESERIALIZATIONPOLICY_H */ +#endif /* BASESERIALIZATIONPOLICY_H */ diff --git a/fairmq/devices/BaseSinkPolicy.h b/fairmq/devices/BaseSinkPolicy.h index a14b5618..99e65885 100644 --- a/fairmq/devices/BaseSinkPolicy.h +++ b/fairmq/devices/BaseSinkPolicy.h @@ -6,20 +6,18 @@ */ #ifndef BASESINKPOLICY_H -#define BASESINKPOLICY_H - +#define BASESINKPOLICY_H #include + // CRTP base class template class BaseSinkPolicy { -public: - BaseSinkPolicy() - {} + public: + BaseSinkPolicy() {} - virtual ~BaseSinkPolicy() - {} + virtual ~BaseSinkPolicy() {} template auto AddToFile(CONTAINER_TYPE container) -> decltype(static_cast(this)->AddToFile(container) ) @@ -34,8 +32,6 @@ public: static_assert(std::is_same{}, "BaseSinkPolicy::InitOutputFile hack broken"); return static_cast(this)->InitOutputFile(); } - }; -#endif /* BASESINKPOLICY_H */ - +#endif /* BASESINKPOLICY_H */ diff --git a/fairmq/devices/BaseSourcePolicy.h b/fairmq/devices/BaseSourcePolicy.h index 43223cd0..f79c8f61 100644 --- a/fairmq/devices/BaseSourcePolicy.h +++ b/fairmq/devices/BaseSourcePolicy.h @@ -6,20 +6,19 @@ */ #ifndef BASESOURCEPOLICY_H -#define BASESOURCEPOLICY_H +#define BASESOURCEPOLICY_H #include + // c++11 code // CRTP base class template class BaseSourcePolicy { -public: - BaseSourcePolicy() - {} + public: + BaseSourcePolicy() {} - virtual ~BaseSourcePolicy() - {} + virtual ~BaseSourcePolicy() {} template auto InitSource()-> decltype(static_cast(this)->InitSource() ) @@ -49,7 +48,6 @@ public: static_assert(std::is_same{}, "BaseSourcePolicy::GetOutData hack broken"); return static_cast(this)->GetOutData(); } - }; /* @@ -87,5 +85,5 @@ public: }; */ -#endif /* BASESOURCEPOLICY_H */ +#endif /* BASESOURCEPOLICY_H */ diff --git a/fairmq/devices/GenericMerger.h b/fairmq/devices/GenericMerger.h index c5e0dcb9..21c65a2c 100644 --- a/fairmq/devices/GenericMerger.h +++ b/fairmq/devices/GenericMerger.h @@ -6,7 +6,7 @@ */ #ifndef GENERICMERGER_H -#define GENERICMERGER_H +#define GENERICMERGER_H #include @@ -72,4 +72,3 @@ class GenericMerger : public FairMQDevice, public MergerPolicy, public InputPoli }; #endif /* GENERICMERGER_H */ - diff --git a/fairmq/devices/GenericSampler.tpl b/fairmq/devices/GenericSampler.tpl index 9cc8def8..07d049f6 100644 --- a/fairmq/devices/GenericSampler.tpl +++ b/fairmq/devices/GenericSampler.tpl @@ -13,6 +13,7 @@ base_GenericSampler::base_GenericSampler() , fEventRate(1) , fEventCounter(0) , fContinuous(false) + , fTaskList() { } diff --git a/fairmq/nanomsg/FairMQMessageNN.h b/fairmq/nanomsg/FairMQMessageNN.h index 6816f0cb..c0a19c0b 100644 --- a/fairmq/nanomsg/FairMQMessageNN.h +++ b/fairmq/nanomsg/FairMQMessageNN.h @@ -25,6 +25,8 @@ class FairMQMessageNN : public FairMQMessage FairMQMessageNN(); FairMQMessageNN(size_t size); FairMQMessageNN(void* data, size_t size, fairmq_free_fn *ffn = NULL, void* hint = NULL); + FairMQMessageNN(const FairMQMessageNN&) = delete; + FairMQMessageNN operator=(const FairMQMessageNN&) = delete; virtual void Rebuild(); virtual void Rebuild(size_t size); @@ -50,10 +52,6 @@ class FairMQMessageNN : public FairMQMessage bool fReceiving; void Clear(); - - /// Copy Constructor - FairMQMessageNN(const FairMQMessageNN&); - FairMQMessageNN operator=(const FairMQMessageNN&); }; #endif /* FAIRMQMESSAGENN_H_ */ diff --git a/fairmq/nanomsg/FairMQPollerNN.h b/fairmq/nanomsg/FairMQPollerNN.h index cb01382b..ebba554f 100644 --- a/fairmq/nanomsg/FairMQPollerNN.h +++ b/fairmq/nanomsg/FairMQPollerNN.h @@ -33,6 +33,8 @@ class FairMQPollerNN : public FairMQPoller public: FairMQPollerNN(const std::vector& channels); FairMQPollerNN(std::unordered_map>& channelsMap, std::initializer_list channelList); + FairMQPollerNN(const FairMQPollerNN&) = delete; + FairMQPollerNN operator=(const FairMQPollerNN&) = delete; virtual void Poll(const int timeout); virtual bool CheckInput(const int index); @@ -49,10 +51,6 @@ class FairMQPollerNN : public FairMQPoller int fNumItems; std::unordered_map fOffsetMap; - - /// Copy Constructor - FairMQPollerNN(const FairMQPollerNN&); - FairMQPollerNN operator=(const FairMQPollerNN&); }; #endif /* FAIRMQPOLLERNN_H_ */ \ No newline at end of file diff --git a/fairmq/nanomsg/FairMQSocketNN.h b/fairmq/nanomsg/FairMQSocketNN.h index ac5684a9..ac69326e 100644 --- a/fairmq/nanomsg/FairMQSocketNN.h +++ b/fairmq/nanomsg/FairMQSocketNN.h @@ -27,6 +27,8 @@ class FairMQSocketNN : public FairMQSocket { public: FairMQSocketNN(const std::string& type, const std::string& name, int numIoThreads); // numIoThreads is not used in nanomsg. + FairMQSocketNN(const FairMQSocketNN&) = delete; + FairMQSocketNN operator=(const FairMQSocketNN&) = delete; virtual std::string GetId(); @@ -67,10 +69,6 @@ class FairMQSocketNN : public FairMQSocket unsigned long fBytesRx; unsigned long fMessagesTx; unsigned long fMessagesRx; - - /// Copy Constructor - FairMQSocketNN(const FairMQSocketNN&); - FairMQSocketNN operator=(const FairMQSocketNN&); }; #endif /* FAIRMQSOCKETNN_H_ */ diff --git a/fairmq/options/FairProgOptions.cxx b/fairmq/options/FairProgOptions.cxx index 9242810b..8d1233d2 100644 --- a/fairmq/options/FairProgOptions.cxx +++ b/fairmq/options/FairProgOptions.cxx @@ -18,15 +18,19 @@ using namespace std; /// ////////////////////////////////////////////////////////////////////////////////////////////////////// /// Constructor -FairProgOptions::FairProgOptions() : +FairProgOptions::FairProgOptions() : fGenericDesc("Generic options description"), fConfigDesc("Configuration options description"), fHiddenDesc("Hidden options description"), - fEnvironmentDesc("Environment Variables"), + fEnvironmentDesc("Environment variables"), fCmdLineOptions("Command line options"), fConfigFileOptions("Configuration file options"), fVisibleOptions("Visible options"), - fVerboseLvl("INFO"), fUseConfigFile(false), fConfigFile() + fVerboseLvl("INFO"), + fUseConfigFile(false), + fConfigFile(), + fVarMap(), + fSeverityMap() { // define generic options fGenericDesc.add_options() @@ -141,7 +145,7 @@ int FairProgOptions::ParseCmdLine(const int argc, char** argv, const po::options int FairProgOptions::ParseCmdLine(const int argc, char** argv, const po::options_description& desc, bool allowUnregistered) { - return ParseCmdLine(argc,argv,desc,fVarMap,allowUnregistered); + return ParseCmdLine(argc, argv, desc, fVarMap, allowUnregistered); } int FairProgOptions::ParseCfgFile(ifstream& ifs, const po::options_description& desc, po::variables_map& varmap, bool allowUnregistered) diff --git a/fairmq/options/FairProgOptions.h b/fairmq/options/FairProgOptions.h index adbc870f..1c878d09 100644 --- a/fairmq/options/FairProgOptions.h +++ b/fairmq/options/FairProgOptions.h @@ -96,13 +96,13 @@ class FairProgOptions // convert value to string that corresponds to the key std::string GetStringValue(const std::string& key); - - const po::variables_map& GetVarMap() const {return fVarMap;} - + + const po::variables_map& GetVarMap() const { return fVarMap; } + // boost prog options parsers int ParseCmdLine(const int argc, char** argv, const po::options_description& desc, po::variables_map& varmap, bool allowUnregistered = false); int ParseCmdLine(const int argc, char** argv, const po::options_description& desc, bool allowUnregistered = false); - + int ParseCfgFile(const std::string& filename, const po::options_description& desc, po::variables_map& varmap, bool allowUnregistered = false); int ParseCfgFile(const std::string& filename, const po::options_description& desc, bool allowUnregistered = false); int ParseCfgFile(std::ifstream& ifs, const po::options_description& desc, po::variables_map& varmap, bool allowUnregistered = false); diff --git a/fairmq/options/FairProgOptionsHelper.h b/fairmq/options/FairProgOptionsHelper.h index 51df98bb..015f7bad 100644 --- a/fairmq/options/FairProgOptionsHelper.h +++ b/fairmq/options/FairProgOptionsHelper.h @@ -25,8 +25,6 @@ #include #include - - template std::ostream& operator<<(std::ostream& os, const std::vector& v) { @@ -36,9 +34,8 @@ std::ostream& operator<<(std::ostream& os, const std::vector& v) namespace fairmq { - namespace po = boost::program_options; - + //_____________________________________________________________________________________________________________________________ template @@ -108,6 +105,7 @@ namespace fairmq return std::string("empty value"); } }; + //_____________________________________________________________________________________________________________________________ // policy to convert variable value content into a tuple with value, type, defaulted, empty information diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h index 27f69f6b..140290e5 100644 --- a/fairmq/tools/runSimpleMQStateMachine.h +++ b/fairmq/tools/runSimpleMQStateMachine.h @@ -28,8 +28,6 @@ #include "FairMQParser.h" #include "FairMQProgOptions.h" - - // template function that take any device, // and run a simple MQ state machine configured from a JSON file template @@ -114,6 +112,4 @@ inline int runNonInteractiveStateMachine(TMQDevice& device, FairMQProgOptions& c return 0; } - #endif /* RUNSIMPLEMQSTATEMACHINE_H */ - diff --git a/fairmq/zeromq/FairMQContextZMQ.h b/fairmq/zeromq/FairMQContextZMQ.h index 9532e0ff..fbe4c5f8 100644 --- a/fairmq/zeromq/FairMQContextZMQ.h +++ b/fairmq/zeromq/FairMQContextZMQ.h @@ -20,6 +20,8 @@ class FairMQContextZMQ public: /// Constructor FairMQContextZMQ(int numIoThreads); + FairMQContextZMQ(const FairMQContextZMQ&) = delete; + FairMQContextZMQ operator=(const FairMQContextZMQ&) = delete; virtual ~FairMQContextZMQ(); void* GetContext(); @@ -27,10 +29,6 @@ class FairMQContextZMQ private: void* fContext; - - /// Copy Constructor - FairMQContextZMQ(const FairMQContextZMQ&); - FairMQContextZMQ operator=(const FairMQContextZMQ&); }; #endif /* FAIRMQCONTEXTZMQ_H_ */ diff --git a/fairmq/zeromq/FairMQPollerZMQ.h b/fairmq/zeromq/FairMQPollerZMQ.h index 8a0d3c29..7164fc19 100644 --- a/fairmq/zeromq/FairMQPollerZMQ.h +++ b/fairmq/zeromq/FairMQPollerZMQ.h @@ -33,6 +33,8 @@ class FairMQPollerZMQ : public FairMQPoller public: FairMQPollerZMQ(const std::vector& channels); FairMQPollerZMQ(std::unordered_map>& channelsMap, std::initializer_list channelList); + FairMQPollerZMQ(const FairMQPollerZMQ&) = delete; + FairMQPollerZMQ operator=(const FairMQPollerZMQ&) = delete; virtual void Poll(const int timeout); virtual bool CheckInput(const int index); @@ -49,10 +51,6 @@ class FairMQPollerZMQ : public FairMQPoller int fNumItems; std::unordered_map fOffsetMap; - - /// Copy Constructor - FairMQPollerZMQ(const FairMQPollerZMQ&); - FairMQPollerZMQ operator=(const FairMQPollerZMQ&); }; #endif /* FAIRMQPOLLERZMQ_H_ */ \ No newline at end of file diff --git a/fairmq/zeromq/FairMQSocketZMQ.h b/fairmq/zeromq/FairMQSocketZMQ.h index 6fff15f6..60d686a3 100644 --- a/fairmq/zeromq/FairMQSocketZMQ.h +++ b/fairmq/zeromq/FairMQSocketZMQ.h @@ -24,6 +24,8 @@ class FairMQSocketZMQ : public FairMQSocket { public: FairMQSocketZMQ(const std::string& type, const std::string& name, int numIoThreads); + FairMQSocketZMQ(const FairMQSocketZMQ&) = delete; + FairMQSocketZMQ operator=(const FairMQSocketZMQ&) = delete; virtual std::string GetId(); @@ -66,10 +68,6 @@ class FairMQSocketZMQ : public FairMQSocket unsigned long fMessagesRx; static boost::shared_ptr fContext; - - /// Copy Constructor - FairMQSocketZMQ(const FairMQSocketZMQ&); - FairMQSocketZMQ operator=(const FairMQSocketZMQ&); }; #endif /* FAIRMQSOCKETZMQ_H_ */