From 2ce9615e73eeda3ff002e3bd2a52e2f310ccc7d3 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Thu, 16 Jan 2014 09:46:21 +0100 Subject: [PATCH] Bug 1838 - FlowMonitorHelper must not be copied. --- RELEASE_NOTES | 1 + src/flow-monitor/helper/flow-monitor-helper.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 0981cf914..27b45c658 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -33,6 +33,7 @@ Bugs fixed - Bug 1786 - os << int64x64_t prints un-normalized fractional values - Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6 - Bug 1837 - AODV crashes when using multiple interfaces +- Bug 1838 - FlowMonitorHelper must not be copied. Release 3.19 ============= diff --git a/src/flow-monitor/helper/flow-monitor-helper.h b/src/flow-monitor/helper/flow-monitor-helper.h index 38f91c63d..aa04a3b9c 100644 --- a/src/flow-monitor/helper/flow-monitor-helper.h +++ b/src/flow-monitor/helper/flow-monitor-helper.h @@ -80,6 +80,20 @@ public: Ptr GetClassifier (); private: + /** + * \brief Copy constructor + * + * Defined and unimplemented to avoid misuse + */ + FlowMonitorHelper (const FlowMonitorHelper&); + /** + * \brief Copy constructor + * + * Defined and unimplemented to avoid misuse + * \returns + */ + FlowMonitorHelper& operator= (const FlowMonitorHelper&); + ObjectFactory m_monitorFactory; //!< Object factory Ptr m_flowMonitor; //!< the FlowMonitor object Ptr m_flowClassifier; //!< the FlowClassifier object