changed abs to _Abs for avoiding build error

Change-Id: Ifae414735aa4b44d891ef38fa0ff3c004b06347d
Signed-off-by: Dae Young Ryu <karzia@samsung.com>

diff --git a/src/ui/animations/FUiAnim_VisualElementImpl.cpp b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
index 77bc5e9..32320ff 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementImpl.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
@@ -24,6 +24,9 @@
 
 #include <typeinfo>
 #include <unique_ptr.h>
+#include <limits>
+#include <algorithm>
+
 #include <FBaseString.h>
 #include <FBaseSysLog.h>
 #include <FGrpFloatPoint.h>
@@ -59,8 +62,6 @@
 #include "FUiAnim_AnimationManager.h"
 
 //3D feature
-#include <algorithm>
-#include <limits>
 #include "FUiAnimMesh.h"
 #include "FUiAnim_MeshImpl.h"
 #include "FUiAnim_VisualElementSharedData.h"
@@ -90,7 +91,6 @@
 #include "FUiAnim_VisualElementEnvironment.h"
 #endif
 
-#include <algorithm>
 #include "math/FUiAnim_MathVector3.h"
 #include "math/FUiAnim_MathVector4.h"
 #include "math/FUiAnim_MathMatrix4.h"
@@ -286,8 +286,8 @@ public:
     std::pair<bool, float> IntersectsPlane()
     {
         float rayOnNormal = Normal.Dot(Ray.Direction);
-        if (abs(rayOnNormal) < std::numeric_limits<float>::epsilon())
-        {
+               if (_Abs(rayOnNormal) < std::numeric_limits<float>::epsilon())
+               {
                return make_pair(false, 0.0f);
         }
 
@@ -296,11 +296,10 @@ public:
         return make_pair(true, T);
     }
 
-
     std::pair<bool, _Math::Vector3> IntersectsTriangle()
     {
        _Math::Vector3 pP = Ray.Position + Ray.Direction * T;
-       _Math::Vector3 normalAbs(abs(Normal.x), abs(Normal.y), abs(Normal.z));
+               _Math::Vector3 normalAbs(_Abs(Normal.x), _Abs(Normal.y), _Abs(Normal.z));
 
         maxInd = 0;
         if (normalAbs.y > normalAbs.x && normalAbs.y > normalAbs.z)
@@ -347,8 +346,8 @@ private:
 
 _VisualElementImpl::_VisualElementImpl(VisualElement& element)
        : _zOrderGroup(Z_ORDER_GROUP_NORMAL)
-       , __globalRay(_Math::Vector3(0.0f),_Math::Vector3(0.0f))
        , __boundingVolume()
+       , __globalRay(_Math::Vector3(0.0f),_Math::Vector3(0.0f))
        , __hasGlobalRay(false)
        , __nearestDistance(std::numeric_limits<float>::infinity())
        , __pNearestVEImpl(null)
@@ -7820,7 +7819,7 @@ _VisualElementImpl::AddAnimationI(const Tizen::Base::String* pKeyName, VisualEle
 
                if (endValue.IsEmpty() == false && InvokeOnGetPropertyRequested(propertyName) != endValue)
                {
-                       (void) InvokeOnSetPropertyRequested(propertyName, endValue);
+                       InvokeOnSetPropertyRequested(propertyName, endValue);
                }
        }