From 5653dfd7ba7ac7cd6db616f6d2a3123aaa45767d Mon Sep 17 00:00:00 2001 From: seungho baek Date: Tue, 18 Jul 2023 18:00:48 +0900 Subject: [PATCH] Revert "[Tizen] Fix more compile error/warnings for gcc-13" This reverts commit d494963f8d0fb5ba2f7ab85fe95a5ae9a5f4555e. --- .../dali-internal/utc-Dali-Internal-ActorObserver.cpp | 18 +----------------- .../utc-Dali-Internal-IndexedConstStringMap.cpp | 15 ++++++++------- .../dali-internal/utc-Dali-Internal-OwnerPointer.cpp | 10 +--------- .../src/dali/dali-test-suite-utils/test-actor-utils.h | 1 - automated-tests/src/dali/utc-Dali-PropertyArray.cpp | 10 +--------- automated-tests/src/dali/utc-Dali-PropertyMap.cpp | 10 +--------- automated-tests/src/dali/utc-Dali-PropertyValue.cpp | 10 +--------- dali/devel-api/addons/addon-dispatch-table.h | 3 +-- dali/public-api/math/random.h | 5 +---- 9 files changed, 15 insertions(+), 67 deletions(-) diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-ActorObserver.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-ActorObserver.cpp index c6478e3..50d1e87 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-ActorObserver.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-ActorObserver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 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. @@ -153,19 +153,11 @@ int UtcDaliActorObserverMoveConstructorAndAssignmentEmpty(void) DALI_TEST_EQUALS(observer1.GetActor(), nullptr, TEST_LOCATION); DALI_TEST_EQUALS(observer2.GetActor(), nullptr, TEST_LOCATION); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Ensure self assignment doesn't change anything observer1 = std::move(observer1); observer2 = std::move(observer2); DALI_TEST_EQUALS(observer1.GetActor(), nullptr, TEST_LOCATION); DALI_TEST_EQUALS(observer2.GetActor(), nullptr, TEST_LOCATION); -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif END_TEST; } @@ -193,19 +185,11 @@ int UtcDaliActorObserverMoveConstructorAndAssignment(void) DALI_TEST_EQUALS(observer1.GetActor(), &actorImpl, TEST_LOCATION); DALI_TEST_EQUALS(observer2.GetActor(), nullptr, TEST_LOCATION); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Self assignment observer1 = std::move(observer1); observer2 = std::move(observer2); DALI_TEST_EQUALS(observer1.GetActor(), &actorImpl, TEST_LOCATION); DALI_TEST_EQUALS(observer2.GetActor(), nullptr, TEST_LOCATION); -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif END_TEST; } diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-IndexedConstStringMap.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-IndexedConstStringMap.cpp index 70ad4fd..37fba19 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-IndexedConstStringMap.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-IndexedConstStringMap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -49,15 +49,16 @@ std::string RandomString(size_t length) return s; } -} // namespace - -// Custom DALI_TEST_EQUALS for ConstString -template<> -inline void DALI_TEST_EQUALS(ConstString str1, ConstString str2, const char* location) +// Custom << operator to print debugging log. +std::basic_ostream& operator<<(std::basic_ostream& os, const ConstString& constString) { - DALI_TEST_EQUALS(str1.GetStringView(), str2.GetStringView(), location); + std::string convertedString = std::string(constString.GetStringView()); + os << convertedString; + return os; } +} // namespace + void utc_dali_internal_indexed_conststring_map_startup(void) { test_return_value = TET_UNDEF; diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-OwnerPointer.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-OwnerPointer.cpp index f1aba87..01af1ad 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-OwnerPointer.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-OwnerPointer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 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. @@ -163,20 +163,12 @@ int UtcDaliOwnerPointerMove(void) DALI_TEST_CHECK(second.Get() == owned); DALI_TEST_EQUALS(deleted, false, TEST_LOCATION); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Self assignment, nothing should change or be deleted. first = std::move(first); second = std::move(second); DALI_TEST_CHECK(first.Get() == nullptr); DALI_TEST_CHECK(second.Get() == owned); DALI_TEST_EQUALS(deleted, false, TEST_LOCATION); -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif // Assign second to first, no deletion, second should have a nullptr now first = std::move(second); diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.h index 03a65c1..6571365 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.h @@ -19,7 +19,6 @@ */ // EXTERNAL INCLUDES -#include #include #include #include // For std::multiset diff --git a/automated-tests/src/dali/utc-Dali-PropertyArray.cpp b/automated-tests/src/dali/utc-Dali-PropertyArray.cpp index 40a7c12..2858170 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyArray.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyArray.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 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. @@ -368,17 +368,9 @@ int UtcDaliPropertyArrayMoveAssignmentOperator(void) DALI_TEST_ASSERTION(const_cast(array1)[0], exceptionMessage); DALI_TEST_ASSERTION(Property::Array temp; array1 = temp, exceptionMessage); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Self assignemnt array2 = std::move(array2); DALI_TEST_EQUALS(3u, array2.Size(), TEST_LOCATION); // still works, no debug assert -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif END_TEST; } diff --git a/automated-tests/src/dali/utc-Dali-PropertyMap.cpp b/automated-tests/src/dali/utc-Dali-PropertyMap.cpp index c992baf..61edaee 100755 --- a/automated-tests/src/dali/utc-Dali-PropertyMap.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyMap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -162,17 +162,9 @@ int UtcDaliPropertyMapMoveAssignmentOperator(void) DALI_TEST_ASSERTION(const_cast(map1)[0], exceptionMessage); DALI_TEST_ASSERTION(Property::Map temp; map1 = temp, exceptionMessage); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Self assignment map2 = std::move(map2); DALI_TEST_EQUALS(3u, map2.Count(), TEST_LOCATION); // No debug assert as nothing should happen -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif END_TEST; } diff --git a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp index 449fce2..bf9c4b0 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -812,18 +812,10 @@ int UtcDaliPropertyValueMoveAssignmentOperator(void) DALI_TEST_EQUALS(true, value2.Get(valueFloat), TEST_LOCATION); // Should be able to convert to a float now DALI_TEST_EQUALS(valueFloat, 1.0f, TEST_LOCATION); - // Self std::move assignment make compile warning over gcc-13. Let we ignore the warning. -#if (__GNUC__ >= 13) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wself-move" -#endif // Ensure self assignment doesn't do anything silly value2 = std::move(value2); DALI_TEST_EQUALS(true, value2.Get(valueFloat), TEST_LOCATION); DALI_TEST_EQUALS(valueFloat, 1.0f, TEST_LOCATION); -#if (__GNUC__ >= 13) -#pragma GCC diagnostic pop -#endif END_TEST; } diff --git a/dali/devel-api/addons/addon-dispatch-table.h b/dali/devel-api/addons/addon-dispatch-table.h index d50826f..12c9c64 100644 --- a/dali/devel-api/addons/addon-dispatch-table.h +++ b/dali/devel-api/addons/addon-dispatch-table.h @@ -2,7 +2,7 @@ #define DALI_ADDON_DISPATCH_TABLE_H /* - * Copyright (c) 2023 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. @@ -21,7 +21,6 @@ #include #include #include -#include namespace Dali { diff --git a/dali/public-api/math/random.h b/dali/public-api/math/random.h index 4d9fd4f..066e4ba 100644 --- a/dali/public-api/math/random.h +++ b/dali/public-api/math/random.h @@ -2,7 +2,7 @@ #define DALI_RANDOM_H /* - * Copyright (c) 2023 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. @@ -20,10 +20,7 @@ // INTERNAL INCLUDES #include - -// EXTERNAL INCLUDES #include -#include ///< for time(nullptr) namespace Dali { -- 2.7.4