Merge "Few warnings removed (MSVC)." into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / common / constants.cpp

diff --git a/dali/public-api/common/constants.cpp b/dali/public-api/common/constants.cpp
index 2023811..ca1d222 100644 (file)
--- a/dali/public-api/common/constants.cpp
+++ b/dali/public-api/common/constants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,4 @@ const float Math::MACHINE_EPSILON_100   = Epsilon<100>::value;
 const float Math::MACHINE_EPSILON_1000  = Epsilon<1000>::value;
 const float Math::MACHINE_EPSILON_10000 = Epsilon<10000>::value;
 
-const std::string String::EMPTY("");
-
 } // namespace Dali