Revert "[Tizen] Make Dali::InstrusivePtr able to compare with nullptr"

This reverts commit 7f65f68f7fc73f55c6e88809a344a930e8574bcf.

diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
index 5b2061b..b55478a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -308,30 +308,6 @@ int UtcDaliBaseHandleInequalityOperator02(void)
   END_TEST;
 }
 
-int UtcDaliBaseHandleInequalityWithNullptr(void)
-{
-  TestApplication application;
-  tet_infoline("Test for Dali::BaseHandle::operator == nullptr");
-
-  BaseHandle object;
-
-  // object is nullptr.
-  DALI_TEST_CHECK(object == nullptr);
-  DALI_TEST_CHECK(nullptr == object);
-  DALI_TEST_CHECK(!(object != nullptr));
-  DALI_TEST_CHECK(!(nullptr != object));
-
-  object = Actor::New();
-
-  // object is not nullptr.
-  DALI_TEST_CHECK(!(object == nullptr));
-  DALI_TEST_CHECK(!(nullptr == object));
-  DALI_TEST_CHECK(object != nullptr);
-  DALI_TEST_CHECK(nullptr != object);
-
-  END_TEST;
-}
-
 int UtcDaliBaseHandleStlVector(void)
 {
   TestApplication application;

diff --git a/automated-tests/src/dali/utc-Dali-IntrusivePtr.cpp b/automated-tests/src/dali/utc-Dali-IntrusivePtr.cpp
index 9e838a7..77454af 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-IntrusivePtr.cpp
+++ b/automated-tests/src/dali/utc-Dali-IntrusivePtr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -608,27 +608,3 @@ int UtcDaliIntrusivePtrMoveAssignment(void)
 
   END_TEST;
 }
-
-/** Equality with nullptr */
-int UtcDaliIntrusivePtrOperatorEqualWithNullptr(void)
-{
-  tet_infoline("Test for Dali::IntrusivePtr::operator == nullptr");
-
-  IntrusivePtr<Counted> counted1(new Counted);
-
-  // counted1 is not nullptr.
-  DALI_TEST_CHECK(!(counted1 == nullptr));
-  DALI_TEST_CHECK(!(nullptr == counted1));
-  DALI_TEST_CHECK(counted1 != nullptr);
-  DALI_TEST_CHECK(nullptr != counted1);
-
-  counted1 = nullptr;
-
-  // counted1 is nullptr.
-  DALI_TEST_CHECK(counted1 == nullptr);
-  DALI_TEST_CHECK(nullptr == counted1);
-  DALI_TEST_CHECK(!(counted1 != nullptr));
-  DALI_TEST_CHECK(!(nullptr != counted1));
-
-  END_TEST;
-}

diff --git a/dali/public-api/common/intrusive-ptr.h b/dali/public-api/common/intrusive-ptr.h
index 30ee989..9397d14 100644 (file)
--- a/dali/public-api/common/intrusive-ptr.h
+++ b/dali/public-api/common/intrusive-ptr.h
@@ -2,7 +2,7 @@
 #define DALI_INTRUSIVE_PTR_H
 
 /*
- * Copyright (c) 2022 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.
@@ -18,9 +18,6 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <cstddef> // for std::nullptr_t
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -381,62 +378,6 @@ inline bool operator!=(T* lhs, IntrusivePtr<U> const& rhs)
 }
 
 /**
- * @brief Comparison overrides of objects with nullptr_t.
- *
- * @SINCE_2_1.11
- * @param[in] lhs Intrusive pointer to compare with
- * @param[in] rhs nullptr
- * @return True if the pointers is nullptr
- */
-template<typename T>
-inline bool operator==(IntrusivePtr<T> const& lhs, std::nullptr_t rhs)
-{
-  return lhs.Get() == nullptr;
-}
-
-/**
- * @brief Comparison overrides of objects with nullptr_t.
- *
- * @SINCE_2_1.11
- * @param[in] lhs Intrusive pointer to compare with
- * @param[in] rhs nullptr
- * @return True if the pointers is not nullptr
- */
-template<typename T>
-inline bool operator!=(IntrusivePtr<T> const& lhs, std::nullptr_t rhs)
-{
-  return lhs.Get() != nullptr;
-}
-
-/**
- * @brief Comparison overrides of objects with nullptr_t.
- *
- * @SINCE_2_1.11
- * @param[in] lhs nullptr
- * @param[in] rhs Intrusive pointer to compare against
- * @return True if the pointers is nullptr
- */
-template<typename T>
-inline bool operator==(std::nullptr_t lhs, IntrusivePtr<T> const& rhs)
-{
-  return nullptr == rhs.Get();
-}
-
-/**
- * @brief Comparison overrides of objects with nullptr_t.
- *
- * @SINCE_2_1.11
- * @param[in] lhs nullptr
- * @param[in] rhs Intrusive pointer to compare against
- * @return True if the pointers is not nullptr
- */
-template<typename T>
-inline bool operator!=(std::nullptr_t lhs, IntrusivePtr<T> const& rhs)
-{
-  return nullptr != rhs.Get();
-}
-
-/**
  * @}
  */
 } // namespace Dali