moving COMPILE_TIME_ASSERT to common from math (has nothing to do with math)

[Problem]
[Cause]
[Solution]

Change-Id: I5a1d336beb51e00a973f12f9c24712bafa30a6e1

diff --git a/dali/public-api/common/compile-time-assert.h b/dali/public-api/common/compile-time-assert.h
new file mode 100644 (file)
index 0000000..207c86f
--- /dev/null
+++ b/dali/public-api/common/compile-time-assert.h
@@ -0,0 +1,44 @@
+#ifndef __DALI_COMPILE_TIME_ASSERT_H__
+#define __DALI_COMPILE_TIME_ASSERT_H__
+
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
+// EXTERNAL INCLUDES
+#include <cstddef>
+
+namespace Dali
+{
+
+template <bool x> struct CompileTimeAssertBool;    ///< Bool Template to test condition
+template <> struct CompileTimeAssertBool<true> {}; ///< Specialize for true, but not for false
+
+template<int x> struct CompileTimeAssertInt {};    ///< Template to wrap conditional template CompileTimeAsserBool
+
+/**
+ * @brief Use DALI_COMPILE_TIME_ASSERT to test expressions at compile time.
+ *
+ * If x is false, then 'sizeof' will be attempted with incomplete type.
+ */
+#define DALI_COMPILE_TIME_ASSERT( x ) typedef CompileTimeAssertInt< sizeof( CompileTimeAssertBool< ( x ) > ) > CompileTimeAssertType __attribute__((__unused__))
+
+} // namespace Dali
+
+#endif // __DALI_COMPILE_TIME_ASSERT_H__

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index f5be552572eab018d5f876cab4250a4c1df074d3..812f52f62bc29f0ebb8c2c47ebb83ee224b0fbcb 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -46,6 +46,7 @@
 #include <dali/public-api/animation/key-frames.h>
 #include <dali/public-api/animation/time-period.h>
 
+#include <dali/public-api/common/compile-time-assert.h>
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/dali-vector.h>
@@ -100,7 +101,6 @@
 #include <dali/public-api/images/pixel.h>
 
 #include <dali/public-api/math/angle-axis.h>
-#include <dali/public-api/math/compile-time-assert.h>
 #include <dali/public-api/math/compile-time-math.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/math-utils.h>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 98c35997f6f75f5a84c3c3945632e16a2be2c356..cac1c2b5267eb073460bfacf91ae7eca840a2b97 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -155,6 +155,7 @@ public_api_core_animation_header_files = \
   $(public_api_src_dir)/animation/time-period.h
 
 public_api_core_common_header_files = \
+  $(public_api_src_dir)/common/compile-time-assert.h \
   $(public_api_src_dir)/common/constants.h \
   $(public_api_src_dir)/common/dali-common.h \
   $(public_api_src_dir)/common/dali-vector.h \
@@ -218,7 +219,6 @@ public_api_core_images_header_files = \
 
 public_api_core_math_header_files = \
   $(public_api_src_dir)/math/angle-axis.h \
-  $(public_api_src_dir)/math/compile-time-assert.h \
   $(public_api_src_dir)/math/compile-time-math.h \
   $(public_api_src_dir)/math/degree.h \
   $(public_api_src_dir)/math/math-utils.h \

diff --git a/dali/public-api/math/compile-time-assert.h b/dali/public-api/math/compile-time-assert.h
deleted file mode 100644 (file)
index 207c86f..0000000
--- a/dali/public-api/math/compile-time-assert.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __DALI_COMPILE_TIME_ASSERT_H__
-#define __DALI_COMPILE_TIME_ASSERT_H__
-
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
-// EXTERNAL INCLUDES
-#include <cstddef>
-
-namespace Dali
-{
-
-template <bool x> struct CompileTimeAssertBool;    ///< Bool Template to test condition
-template <> struct CompileTimeAssertBool<true> {}; ///< Specialize for true, but not for false
-
-template<int x> struct CompileTimeAssertInt {};    ///< Template to wrap conditional template CompileTimeAsserBool
-
-/**
- * @brief Use DALI_COMPILE_TIME_ASSERT to test expressions at compile time.
- *
- * If x is false, then 'sizeof' will be attempted with incomplete type.
- */
-#define DALI_COMPILE_TIME_ASSERT( x ) typedef CompileTimeAssertInt< sizeof( CompileTimeAssertBool< ( x ) > ) > CompileTimeAssertType __attribute__((__unused__))
-
-} // namespace Dali
-
-#endif // __DALI_COMPILE_TIME_ASSERT_H__

diff --git a/dali/public-api/math/compile-time-math.cpp b/dali/public-api/math/compile-time-math.cpp
index 09716a25c2328509db69096d26b19982daf52068..991bb2703486c8fcb4a87abeef2653d63c8dd1d9 100644 (file)
--- a/dali/public-api/math/compile-time-math.cpp
+++ b/dali/public-api/math/compile-time-math.cpp
@@ -19,7 +19,7 @@
 #include <dali/public-api/math/compile-time-math.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/math/compile-time-assert.h>
+#include <dali/public-api/common/compile-time-assert.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/signals/functor-delegate.cpp b/dali/public-api/signals/functor-delegate.cpp
index 4b48cc2f1916cf767af7c135bef683ef08abc1d6..32cd1d1b9e56ebc294f1d102b0ba3350347103c3 100644 (file)
--- a/dali/public-api/signals/functor-delegate.cpp
+++ b/dali/public-api/signals/functor-delegate.cpp
@@ -17,7 +17,9 @@
 
 // CLASS HEADER
 #include <dali/public-api/signals/functor-delegate.h>
-#include <dali/public-api/math/compile-time-assert.h>
+
+// INTERNAL INCLUDES
+#include <dali/public-api/common/compile-time-assert.h>
 
 namespace Dali
 {