Remove o3tl/heap_ptr.hxx, use std::unique_ptr instead

Change-Id: Iac70c9be13892a36bfb5975f62e5345b88d4f144

3 files changed, 0 insertions, 161 deletions

diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index c1d821569d29..a4d6d715853c 100644
--- a/o3tl/CppunitTest_o3tl_tests.mk
+++ b/o3tl/CppunitTest_o3tl_tests.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\
 $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\
 	o3tl/qa/cow_wrapper_clients \
 	o3tl/qa/test-cow_wrapper \
-	o3tl/qa/test-heap_ptr \
 	o3tl/qa/test-range \
 	o3tl/qa/test-vector_pool \
 	o3tl/qa/test-sorted_vector \
diff --git a/o3tl/README b/o3tl/README
index 4823d6073190..de46c853be5b 100644
--- a/o3tl/README
+++ b/o3tl/README
@@ -11,9 +11,6 @@ to boost, but isn't as of now)."
 [git:o3tl/inc/o3tl/cow_wrapper.hxx]
 A copy-on-write wrapper.
 
-[git:o3tl/inc/o3tl/heap_ptr.hxx]
-heap_ptr<> owns an object on the heap, which will be automatically deleted, when ~heap_ptr<>() is called.
-
 [git:o3tl/inc/o3tl/lazy_update.hxx]
 This template collects data in input type, and updates the output type with the given update functor,
 but only if the output is requested. Useful if updating is expensive, or input changes frequently, but
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
deleted file mode 100644
index 4fbfe1957f7a..000000000000
--- a/o3tl/qa/test-heap_ptr.cxx
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you 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 .
- */
-
-#include <sal/types.h>
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-
-#include <o3tl/heap_ptr.hxx>
-
-using o3tl::heap_ptr;
-
-class Help
-{
-  public:
-    explicit            Help(
-                            int                 i_n )
-                                                : n(i_n) { ++nInstanceCount_; }
-                        ~Help()                 { --nInstanceCount_; }
-    int                 Value() const           { return n; }
-    static int          InstanceCount_()        { return nInstanceCount_; }
-
-  private:
-    int                 n;
-    static int          nInstanceCount_;
-};
-int Help::nInstanceCount_ = 0;
-
-
-class heap_ptr_test : public CppUnit::TestFixture
-{
-  public:
-    void global()
-    {
-        // Construction
-        heap_ptr<Help>
-            t_empty;
-        const heap_ptr<Help>
-            t0( new Help(7000) );
-        heap_ptr<Help>
-            t1( new Help(10) );
-        heap_ptr<Help>
-            t2( new Help(20) );
-
-        int nHelpCount = 3;
-
-        CPPUNIT_ASSERT_MESSAGE("ctor1", ! t_empty.is());
-        CPPUNIT_ASSERT_MESSAGE("ctor2",   t0.is());
-        CPPUNIT_ASSERT_MESSAGE("ctor3",   (*t0).Value() == 7000 );
-        CPPUNIT_ASSERT_MESSAGE("ctor4",   t0->Value() == 7000 );
-        CPPUNIT_ASSERT_MESSAGE("ctor5",   t0.get() == t0.operator->() );
-        CPPUNIT_ASSERT_MESSAGE("ctor6",   t0.get() == &(*t0) );
-
-        CPPUNIT_ASSERT_MESSAGE("ctor7",   t1.is());
-        CPPUNIT_ASSERT_MESSAGE("ctor8",   (*t1).Value() == 10 );
-        CPPUNIT_ASSERT_MESSAGE("ctor9",   t1->Value() == 10 );
-        CPPUNIT_ASSERT_MESSAGE("ctor10",   t1.get() == t1.operator->() );
-        CPPUNIT_ASSERT_MESSAGE("ctor11",   t1.get() == &(*t1) );
-
-        CPPUNIT_ASSERT_MESSAGE("ctor12",   t2.operator*().Value() == 20);
-        CPPUNIT_ASSERT_MESSAGE("ctor13",   Help::InstanceCount_() == nHelpCount);
-
-
-        // Operator safe_bool() / bool()
-        CPPUNIT_ASSERT_MESSAGE("bool1", ! t_empty);
-        CPPUNIT_ASSERT_MESSAGE("bool2", t0);
-        CPPUNIT_ASSERT_MESSAGE("bool3", t1.is() == static_cast<bool>(t1));
-
-
-        // Assignment, reset() and release()
-            // Release
-        Help * hp = t1.release();
-        CPPUNIT_ASSERT_MESSAGE("release1", ! t1.is() );
-        CPPUNIT_ASSERT_MESSAGE("release2", t1.get() == 0 );
-        CPPUNIT_ASSERT_MESSAGE("release3", t1.operator->() == 0 );
-        CPPUNIT_ASSERT_MESSAGE("release4", Help::InstanceCount_() == nHelpCount);
-
-            // operator=()
-        t_empty = hp;
-        CPPUNIT_ASSERT_MESSAGE("assign1", t_empty.is() );
-        CPPUNIT_ASSERT_MESSAGE("assign2", Help::InstanceCount_() == nHelpCount);
-
-        t1 = t_empty.release();
-        CPPUNIT_ASSERT_MESSAGE("assign3",     t1.is() );
-        CPPUNIT_ASSERT_MESSAGE("assign4",   ! t_empty.is() );
-        CPPUNIT_ASSERT_MESSAGE("assign5",   Help::InstanceCount_() == nHelpCount);
-
-            // reset()
-        hp = new Help(30);
-        ++nHelpCount;
-
-        t_empty.reset(hp);
-        CPPUNIT_ASSERT_MESSAGE("reset1",  Help::InstanceCount_() == nHelpCount);
-        CPPUNIT_ASSERT_MESSAGE("reset2",  t_empty.is() );
-        CPPUNIT_ASSERT_MESSAGE("reset3",  t_empty.get() == hp );
-
-            // Ignore second assignment
-        t_empty = hp;
-        CPPUNIT_ASSERT_MESSAGE("selfassign1",  Help::InstanceCount_() == nHelpCount);
-        CPPUNIT_ASSERT_MESSAGE("selfassign2",  t_empty.is() );
-        CPPUNIT_ASSERT_MESSAGE("selfassign3",  t_empty.get() == hp );
-
-        t_empty.reset(0);
-        hp = 0;
-        --nHelpCount;
-        CPPUNIT_ASSERT_MESSAGE("reset4",   ! t_empty.is() );
-        CPPUNIT_ASSERT_MESSAGE("reset5",   Help::InstanceCount_() == nHelpCount);
-
-
-        // swap
-        t1.swap(t2);
-        CPPUNIT_ASSERT_MESSAGE("swap1",   t1->Value() == 20 );
-        CPPUNIT_ASSERT_MESSAGE("swap2",   t2->Value() == 10 );
-        CPPUNIT_ASSERT_MESSAGE("swap3",   Help::InstanceCount_() == nHelpCount);
-
-        o3tl::swap(t1,t2);
-        CPPUNIT_ASSERT_MESSAGE("swap4",   t1->Value() == 10 );
-        CPPUNIT_ASSERT_MESSAGE("swap5",   t2->Value() == 20 );
-        CPPUNIT_ASSERT_MESSAGE("swap6",   Help::InstanceCount_() == nHelpCount);
-
-        // RAII
-        {
-            heap_ptr<Help>
-                t_raii( new Help(55) );
-            (void)t_raii;
-            CPPUNIT_ASSERT_MESSAGE("raii1", Help::InstanceCount_() == nHelpCount + 1);
-        }
-        CPPUNIT_ASSERT_MESSAGE("raii2", Help::InstanceCount_() == nHelpCount);
-    }
-
-
-    // These macros are needed by auto register mechanism.
-    CPPUNIT_TEST_SUITE(heap_ptr_test);
-    CPPUNIT_TEST(global);
-    CPPUNIT_TEST_SUITE_END();
-}; // class heap_ptr_test
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION(heap_ptr_test);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */