From 1342812512cefbe76e5f17436aea91a455629cbe Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Wed, 11 Mar 2015 10:51:03 +0000 Subject: [PATCH] Fixed build break Change-Id: If273de0d6474c8f955fa7cd28f93ae59ec895e57 --- dali-toolkit/internal/text/text-controller.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index b0fb0d1..0656b8c 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -41,6 +41,7 @@ using std::vector; namespace { const float MAX_FLOAT = std::numeric_limits::max(); +const std::string EMPTY_STRING; } // namespace namespace Dali @@ -483,7 +484,7 @@ const std::string& Controller::GetDefaultFontFamily() const return mImpl->mFontDefaults->mDefaultFontFamily; } - return Dali::String::EMPTY; + return EMPTY_STRING; } void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) @@ -506,7 +507,7 @@ const std::string& Controller::GetDefaultFontStyle() const return mImpl->mFontDefaults->mDefaultFontStyle; } - return Dali::String::EMPTY; + return EMPTY_STRING; } void Controller::SetDefaultPointSize( float pointSize ) -- 2.7.4