From d35010c1cb0b42c37b1c56485bb1152d07576e75 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 17 Mar 2016 11:00:53 -0400 Subject: [PATCH] Status: remove m_emptyStringtring No reason to have a global for this. --- src/misc/pv/status.h | 4 +--- src/misc/status.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/misc/pv/status.h b/src/misc/pv/status.h index f400916..3ad6cad 100644 --- a/src/misc/pv/status.h +++ b/src/misc/pv/status.h @@ -103,9 +103,7 @@ namespace epics { namespace pvData { void dump(std::ostream& o) const; private: - - static std::string m_emptyStringtring; - + StatusType m_statusType; std::string m_message; std::string m_stackDump; diff --git a/src/misc/status.cpp b/src/misc/status.cpp index c4a1436..deddd1b 100644 --- a/src/misc/status.cpp +++ b/src/misc/status.cpp @@ -17,7 +17,6 @@ using std::string; namespace epics { namespace pvData { const char* Status::StatusTypeName[] = { "OK", "WARNING", "ERROR", "FATAL" }; -string Status::m_emptyStringtring; Status Status::Ok; @@ -102,7 +101,8 @@ void Status::deserialize(ByteBuffer *buffer, DeserializableControl *flusher) if (m_statusType != STATUSTYPE_OK) { m_statusType = STATUSTYPE_OK; - m_message = m_stackDump = m_emptyStringtring; + m_message.clear(); + m_stackDump.clear(); } } else