From fe15a4fe9cd15e1a71eb33bb068e4f8cef664370 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 29 Jul 2016 12:04:31 -0400 Subject: [PATCH] [Base] Make Application::Messages non-copyable --- src/base/application.cpp | 18 ------------------ src/base/application.h | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/base/application.cpp b/src/base/application.cpp index f9ed3afb5..8b2d82c09 100644 --- a/src/base/application.cpp +++ b/src/base/application.cpp @@ -59,24 +59,6 @@ Application::Messages::Messages() logwriter.reset(new Logger()); } -Application::Messages::Messages(const Messages& r) : - errorMessage(r.errorMessage) -{ - // install a default logwriter that writes to standard - // output / standard error - logwriter.reset(new Logger(*r.logwriter)); -} - -Application::Messages& Application::Messages::operator=(const Messages& r) -{ - if (this == &r) { - return *this; - } - errorMessage = r.errorMessage; - logwriter.reset(new Logger(*r.logwriter)); - return *this; -} - void Application::Messages::addError(const std::string& r, const std::string& msg) { if (msg.size() != 0) { diff --git a/src/base/application.h b/src/base/application.h index 32daac461..03dd492d9 100644 --- a/src/base/application.h +++ b/src/base/application.h @@ -44,8 +44,8 @@ protected: public: Messages(); - Messages(const Messages& r); - Messages& operator=(const Messages& r); + Messages(const Messages& r) = delete; + Messages& operator=(const Messages& r) = delete; //! Set an error condition in the application class without //! throwing an exception.