temporary fix: error: no matching function for call to 'max(double, float)' sandbox/jaehun77/gcc6
authorDongkyun, Son <dongkyun.s@samsung.com>
Fri, 4 Nov 2016 07:56:37 +0000 (16:56 +0900)
committerJaehun Jeong <jh4u.jeong@samsung.com>
Sun, 25 Dec 2016 01:52:54 +0000 (10:52 +0900)
Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp

index eadaa49..471f371 100644 (file)
@@ -248,7 +248,7 @@ unsigned int FixedRuler::GetPageFromPosition(float position, bool wrap) const
     {
       position = WrapInDomain(position, mDomain.min, mDomain.max);
     }
-    page = std::max(static_cast<double>(0.0f), floor((position - mDomain.min) / mSpacing + 0.5f));
+    page = std::max(static_cast<double>(0.0f), static_cast<double>(floor((position - mDomain.min) / mSpacing + 0.5f)));
 
     if(wrap)
     {