[dali_1.2.53] Merge branch 'devel/master'

Change-Id: Ic38a971378b66c8ed77273afcdd765626a40cecf

diff --git a/dali/integration-api/debug.cpp b/dali/integration-api/debug.cpp
index 2624818..11b5c35 100644 (file)
--- a/dali/integration-api/debug.cpp
+++ b/dali/integration-api/debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -94,7 +94,7 @@ namespace Integration
 namespace Log
 {
 
-__thread LogFunction gthreadLocalLogFunction = NULL;
+thread_local LogFunction gthreadLocalLogFunction = NULL;
 
 /* Forward declarations */
 std::string FormatToString(const char *format, ...);

diff --git a/dali/internal/common/mutex-impl.cpp b/dali/internal/common/mutex-impl.cpp
index 06d1ddf..9c85e83 100644 (file)
--- a/dali/internal/common/mutex-impl.cpp
+++ b/dali/internal/common/mutex-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -59,11 +59,11 @@ struct BackTraceInfo
   int size;                                  ///< Number of frames in the frame array (can be less than MAX_NUM_STACK_FRAMES)
 };
 
-__thread BackTraceInfo gBackTraceInfo[ MAX_LOCK_SUPPORT ]; ///< Thread local storage for the backtrace of the locks
+thread_local BackTraceInfo gBackTraceInfo[ MAX_LOCK_SUPPORT ]; ///< Thread local storage for the backtrace of the locks
 
 #endif // LOCK_BACKTRACE_ENABLED
 
-__thread unsigned int gThreadLockCount = 0; ///<
+thread_local unsigned int gThreadLockCount = 0; ///< Thread local storage for the backtrace of the locks
 } // unnamed namespace
 
 void Lock( pthread_mutex_t* mutex )

diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp
index f59bd27..559b833 100644 (file)
--- a/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@ -30,7 +30,7 @@ namespace Internal
 
 namespace
 {
-__thread ThreadLocalStorage* threadLocal = NULL;
+thread_local ThreadLocalStorage* threadLocal = NULL;
 }
 
 ThreadLocalStorage::ThreadLocalStorage(Core* core)

diff --git a/dali/public-api/common/compile-time-assert.h b/dali/public-api/common/compile-time-assert.h
index 169242f..d30c694 100644 (file)
--- a/dali/public-api/common/compile-time-assert.h
+++ b/dali/public-api/common/compile-time-assert.h
@@ -2,7 +2,7 @@
 #define __DALI_COMPILE_TIME_ASSERT_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -31,18 +31,12 @@ namespace Dali
  * @{
  */
 
-template <bool x> struct CompileTimeAssertBool;    ///< Bool Template to test condition
-template <> struct CompileTimeAssertBool<true> {}; ///< Specialize for true, but not for false @SINCE_1_0.0
-
-template<int x> struct CompileTimeAssertInt {};    ///< Template to wrap conditional template CompileTimeAsserBool @SINCE_1_0.0
-
 /**
  * @brief Use DALI_COMPILE_TIME_ASSERT to test expressions at compile time.
  *
- * If x is false, then 'sizeof' will be attempted with incomplete type.
  * @SINCE_1_0.0
  */
-#define DALI_COMPILE_TIME_ASSERT( x ) typedef Dali::CompileTimeAssertInt< sizeof( Dali::CompileTimeAssertBool< ( x ) > ) > CompileTimeAssertType __attribute__((__unused__))
+#define DALI_COMPILE_TIME_ASSERT( x ) static_assert( x, #x );
 
 /**
  * @}

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index 16bf03a..1e28c3d 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int CORE_MAJOR_VERSION = 1;
 const unsigned int CORE_MINOR_VERSION = 2;
-const unsigned int CORE_MICRO_VERSION = 52;
+const unsigned int CORE_MICRO_VERSION = 53;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/dali/public-api/math/quaternion.cpp b/dali/public-api/math/quaternion.cpp
index 19546b4..93db036 100644 (file)
--- a/dali/public-api/math/quaternion.cpp
+++ b/dali/public-api/math/quaternion.cpp
@@ -40,18 +40,18 @@ const Quaternion Quaternion::IDENTITY;
  * Default Constructor
  */
 Quaternion::Quaternion()
- : mVector( 0.0f, 0.0f, 0.0f, 1.0f )
+: mVector( 0.0f, 0.0f, 0.0f, 1.0f )
 {
 }
 
-Quaternion::Quaternion( float cosThetaBy2, float iBySineTheta, float jBySineTheta, float kBySineTheta ) :
-  mVector( iBySineTheta, jBySineTheta, kBySineTheta, cosThetaBy2 )
+Quaternion::Quaternion( float cosThetaBy2, float iBySineTheta, float jBySineTheta, float kBySineTheta )
+: mVector( iBySineTheta, jBySineTheta, kBySineTheta, cosThetaBy2 )
 {
 }
 
 Quaternion::Quaternion( const Vector4& vector )
+: mVector( vector )
 {
-  mVector = vector;
 }
 
 Quaternion::Quaternion( Radian angle, const Vector3& axis )

diff --git a/packaging/dali.spec b/packaging/dali.spec
index c983c97..a21daa5 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    The OpenGLES Canvas Core Library
-Version:    1.2.52
+Version:    1.2.53
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT