Enable assert always in Dali::Vector

Change-Id: I1bcc79fd84665d4a127f9572e89fa9331542bd86

diff --git a/automated-tests/src/dali/utc-Dali-CircularQueue.cpp b/automated-tests/src/dali/utc-Dali-CircularQueue.cpp
index 3bf2a26..e5c718c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CircularQueue.cpp
+++ b/automated-tests/src/dali/utc-Dali-CircularQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -15,8 +15,6 @@
  *
  */
 
-#define ENABLE_VECTOR_ASSERTS
-
 #include <dali-test-suite-utils.h>
 #include <dali/devel-api/common/circular-queue.h>
 #include <dali/public-api/dali-core.h>

diff --git a/automated-tests/src/dali/utc-Dali-Vector.cpp b/automated-tests/src/dali/utc-Dali-Vector.cpp
index 8c19dc5..815cf69 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector.cpp
@@ -15,8 +15,6 @@
  *
  */
 
-#define ENABLE_VECTOR_ASSERTS
-
 #include <dali-test-suite-utils.h>
 #include <dali/public-api/dali-core.h>
 #include <stdlib.h>

diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h
index 22003c5..fd4565e 100644 (file)
--- a/dali/public-api/common/dali-vector.h
+++ b/dali/public-api/common/dali-vector.h
@@ -28,21 +28,7 @@
 #include <dali/public-api/common/type-traits.h>
 #include <dali/public-api/math/math-utils.h>
 
-/**
- * @brief For DALi internal use, asserts are enabled in debug builds.
- *
- * For Application use, asserts can be enabled manually.
- * @SINCE_1_0.0
- */
-#if defined(DEBUG_ENABLED)
-#define ENABLE_VECTOR_ASSERTS
-#endif
-
-#if defined(ENABLE_VECTOR_ASSERTS)
 #define DALI_ASSERT_VECTOR(cond) DALI_ASSERT_ALWAYS(cond)
-#else
-#define DALI_ASSERT_VECTOR(cond)
-#endif
 
 namespace Dali
 {