From b4b3131af7fd32dcb180c3b9e93d913c38ebad78 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 5 Aug 2020 13:42:53 +0100 Subject: [PATCH] Use static_assert instead of DALI_COMPILE_TIME_ASSERT Change-Id: I5ff15e12d50da50e9198f0e6b51eacc296d51e33 --- .../devel-api/controls/control-depth-index-ranges.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h index 6c4ed30..f1bb8c3 100644 --- a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h +++ b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -19,7 +19,6 @@ */ // EXTERNAL INCLUDES -#include #include namespace Dali @@ -48,11 +47,11 @@ enum Ranges FOREGROUND_EFFECT = 2 * DevelLayer::SIBLING_ORDER_MULTIPLIER/100 }; -DALI_COMPILE_TIME_ASSERT( (unsigned int)DevelLayer::ACTOR_DEPTH_MULTIPLIER > (unsigned int)DevelLayer::SIBLING_ORDER_MULTIPLIER ); -DALI_COMPILE_TIME_ASSERT( BACKGROUND_EFFECT < BACKGROUND ); -DALI_COMPILE_TIME_ASSERT( BACKGROUND < CONTENT ); -DALI_COMPILE_TIME_ASSERT( CONTENT < DECORATION ); -DALI_COMPILE_TIME_ASSERT( DECORATION < FOREGROUND_EFFECT ); +static_assert( (unsigned int)DevelLayer::ACTOR_DEPTH_MULTIPLIER > (unsigned int)DevelLayer::SIBLING_ORDER_MULTIPLIER ); +static_assert( BACKGROUND_EFFECT < BACKGROUND ); +static_assert( BACKGROUND < CONTENT ); +static_assert( CONTENT < DECORATION ); +static_assert( DECORATION < FOREGROUND_EFFECT ); } // namespace DepthIndex -- 2.7.4