From 296dafdd11fbc0f083ad811f5f4426e713c58ecc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 20 Dec 2005 20:09:15 +0000 Subject: [PATCH] fix "more than one user-defined conversion has been implicitly applied" in SDebugOverlay --- stepmania/src/RageUtil.cpp | 4 ++-- stepmania/src/RageUtil.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index ef35eb2c76..c64d0851cf 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -1953,12 +1953,12 @@ LocalizedString::~LocalizedString() } -LocalizedString::operator const RString&() const +LocalizedString::operator RString() const { return GetValue(); } -const CString &LocalizedString::GetValue() const +RString LocalizedString::GetValue() const { ASSERT(!m_sValue.empty()); return m_sValue; } diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index fd84c04f9b..af2d0eb674 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -513,8 +513,8 @@ public: LocalizedString( const RString &sSection, const RString &sName ); ~LocalizedString(); void Refresh(); - operator const RString&() const; - const RString &GetValue() const; + operator RString() const; + RString GetValue() const; private: RString m_sSection; RString m_sName;