[Libreoffice-commits] core.git: 2 commits - include/o3tl o3tl/CppunitTest_o3tl_tests.mk o3tl/qa
David Tardon
dtardon at redhat.com
Fri Jan 29 05:12:41 PST 2016
include/o3tl/enumarray.hxx | 1
include/o3tl/enumrange.hxx | 2
include/o3tl/functional.hxx | 2
include/o3tl/lazy_update.hxx | 2
include/o3tl/range.hxx | 183 ---------------------------------
include/o3tl/vector_pool.hxx | 1
o3tl/CppunitTest_o3tl_tests.mk | 1
o3tl/qa/test-range.cxx | 226 -----------------------------------------
8 files changed, 418 deletions(-)
New commits:
commit da45a1686088d0b05fd694e0b413527a89027b6e
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 29 13:30:53 2016 +0100
remove unused o3tl::range
Change-Id: I080f4f2cb15d25ecf5545300da422957f24e3f9b
diff --git a/include/o3tl/range.hxx b/include/o3tl/range.hxx
deleted file mode 100644
index 9abfb25..0000000
--- a/include/o3tl/range.hxx
+++ /dev/null
@@ -1,183 +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 .
- */
-
-#ifndef INCLUDED_O3TL_RANGE_HXX
-#define INCLUDED_O3TL_RANGE_HXX
-
-
-#include <cstring>
-#include <cassert>
-
-
-
-namespace o3tl
-{
-/** Represents a range of integer or iterator values.
-
- @tpl T
- Has to be assignable, add- and subtractable. That is:
- either it is
- - an integral type
- - or a random access iterator.
-*/
-template <class T>
-class range
-{
- public:
- typedef T element_type; /// Provided for generic programming.
- typedef range<T> self;
-
- // LIFECYCLE
- range(
- T i_inclusiveLowerBorder,
- T i_exclusiveUpperBorder );
- ~range();
- // INQUIRY
- T begin() const;
- T end() const;
- std::size_t size() const;
-
- bool contains(
- T i_value ) const;
- bool contains(
- const self & i_other ) const;
- bool overlaps(
- const self & i_other ) const;
- /// @return i_other.begin() - this->end()
- long distance_to(
- const self & i_other ) const;
- private:
- // DATA
- T nBegin;
- T nEnd;
-};
-
-
-template <class T>
-inline range<T>
-make_range(T i1, T i2)
-{
- return range<T>(i1, i2);
-}
-
-template <class T>
-inline range<typename T::const_iterator>
-range_of(const T & i_container)
-{
- return make_range( i_container.begin(),
- i_container.end()
- );
-}
-
-template <class T>
-inline range<typename T::iterator>
-range_of(T & io_container)
-{
- return make_range( io_container.begin(),
- io_container.end()
- );
-}
-
-
-
-
-
-// IMPLEMENTATION
-
-template <class T>
-range<T>::range( T i_inclusiveLowerBorder,
- T i_exclusiveUpperBorder )
- : nBegin(i_inclusiveLowerBorder),
- nEnd(i_exclusiveUpperBorder)
-{
- assert( nBegin <= nEnd
- && "Invalid parameters for range<> constructor.");
-}
-
-template <class T>
-range<T>::~range()
-{
-}
-
-template <class T>
-inline T
-range<T>::begin() const
-{
- return nBegin;
-}
-
-template <class T>
-inline T
-range<T>::end() const
-{
- return nEnd;
-}
-
-template <class T>
-inline std::size_t
-range<T>::size() const
-{
- assert( nBegin <= nEnd
- && "Invalid range limits in range<>::size().");
- return static_cast<std::size_t>( end() - begin() );
-}
-
-template <class T>
-bool
-range<T>::contains(T i_value ) const
-{
- return begin() <= i_value
- && i_value < end();
-}
-
-template <class T>
-bool
-range<T>::contains(const self & i_other) const
-{
- // This is subtle, because this would be wrong:
- // begin() <= i_other.begin()
- // && i_other.end() <= end();
- // An empty range that begins and starts at my end()
- // must not be contained.
-
- return contains(i_other.begin())
- && i_other.end() <= end();
-}
-
-template <class T>
-bool
-range<T>::overlaps(const self & i_other) const
-{
- return contains(i_other.begin())
- || i_other.contains(begin());
-}
-
-template <class T>
-long
-range<T>::distance_to(const self & i_other) const
-{
- return i_other.begin() - end();
-}
-
-
-
-} // namespace o3tl
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index c8f8f6b..eb13966 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-range \
o3tl/qa/test-vector_pool \
o3tl/qa/test-sorted_vector \
o3tl/qa/test-typed_flags \
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
deleted file mode 100644
index 852bf76..0000000
--- a/o3tl/qa/test-range.cxx
+++ /dev/null
@@ -1,226 +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/range.hxx>
-#include <vector>
-#include <deque>
-
-using o3tl::range;
-using o3tl::make_range;
-using o3tl::range_of;
-using std::size_t;
-
-class range_test : public CppUnit::TestFixture
-{
-public:
-
- void int_test()
- {
- range<int>
- t1(12,88);
- range<int>
- t2(33,33);
-
- // ctor
- CPPUNIT_ASSERT_MESSAGE("int ctor1", t1.begin() == 12);
- CPPUNIT_ASSERT_MESSAGE("int ctor2", t1.end() == 88);
- CPPUNIT_ASSERT_MESSAGE("int ctor3", t2.begin() == 33);
- CPPUNIT_ASSERT_MESSAGE("int ctor4", t2.end() == 33);
-
- // make_range
- CPPUNIT_ASSERT_MESSAGE("int make_range1", make_range(0,8).begin() == 0);
- CPPUNIT_ASSERT_MESSAGE("int make_range2", make_range(0,8).end() == 8);
-
- // size
- CPPUNIT_ASSERT_MESSAGE("int size1", t1.size() == size_t(t1.end() - t1.begin()) );
- CPPUNIT_ASSERT_MESSAGE("int size2", t2.size() == size_t(0) );
-
- // contains
- range<int> t3(0,10);
- range<int> t4(7, 15);
- range<int> t5(12, 12);
- range<int> t6(13, 77);
- range<int> t7(87, 87);
- range<int> t8(87, 88);
- range<int> t9(88, 88);
- range<int> t10(33, 120);
- range<int> t11(90, 100);
- range<int> t12(200,200);
-
- CPPUNIT_ASSERT_MESSAGE("int contains1", t1.contains(t1));
- CPPUNIT_ASSERT_MESSAGE("int contains2", t1.contains(t2));
- CPPUNIT_ASSERT_MESSAGE("int contains3", ! t1.contains(t3));
- CPPUNIT_ASSERT_MESSAGE("int contains4", ! t1.contains(t4));
- CPPUNIT_ASSERT_MESSAGE("int contains5", t1.contains(t5));
- CPPUNIT_ASSERT_MESSAGE("int contains6", t1.contains(t6));
- CPPUNIT_ASSERT_MESSAGE("int contains7", t1.contains(t7));
- CPPUNIT_ASSERT_MESSAGE("int contains8", t1.contains(t8));
- CPPUNIT_ASSERT_MESSAGE("int contains9", ! t1.contains(t9));
- CPPUNIT_ASSERT_MESSAGE("int contains10", ! t1.contains(t10));
- CPPUNIT_ASSERT_MESSAGE("int contains11", ! t1.contains(t11));
- CPPUNIT_ASSERT_MESSAGE("int contains12", ! t1.contains(t12));
-
- CPPUNIT_ASSERT_MESSAGE("int contains n1", t1.contains(50));
- CPPUNIT_ASSERT_MESSAGE("int contains n2", t1.contains(12));
- CPPUNIT_ASSERT_MESSAGE("int contains n3", t1.contains(87));
- CPPUNIT_ASSERT_MESSAGE("int contains n4", ! t1.contains(3));
- CPPUNIT_ASSERT_MESSAGE("int contains n5", ! t1.contains(11));
- CPPUNIT_ASSERT_MESSAGE("int contains n6", ! t1.contains(88));
- CPPUNIT_ASSERT_MESSAGE("int contains n7", ! t1.contains(100));
-
- // overlaps
- range<int> t13(88,99);
-
- CPPUNIT_ASSERT_MESSAGE("int overlaps1", t1.overlaps(t1));
- CPPUNIT_ASSERT_MESSAGE("int overlaps2", t1.overlaps(t2));
- CPPUNIT_ASSERT_MESSAGE("int overlaps3", ! t1.overlaps(t3));
- CPPUNIT_ASSERT_MESSAGE("int overlaps4", t1.overlaps(t4));
- CPPUNIT_ASSERT_MESSAGE("int overlaps5", t1.overlaps(t5));
- CPPUNIT_ASSERT_MESSAGE("int overlaps6", t1.overlaps(t6));
- CPPUNIT_ASSERT_MESSAGE("int overlaps7", t1.overlaps(t7));
- CPPUNIT_ASSERT_MESSAGE("int overlaps8", t1.overlaps(t8));
- CPPUNIT_ASSERT_MESSAGE("int overlaps9", ! t1.overlaps(t9));
- CPPUNIT_ASSERT_MESSAGE("int overlaps10", t1.overlaps(t10));
- CPPUNIT_ASSERT_MESSAGE("int overlaps11", ! t1.overlaps(t11));
- CPPUNIT_ASSERT_MESSAGE("int overlaps12", ! t1.overlaps(t12));
- CPPUNIT_ASSERT_MESSAGE("int overlaps13", ! t1.overlaps(t13));
-
- // distance_to
- CPPUNIT_ASSERT_MESSAGE("int distance_to1", t1.distance_to(t13) == 0);
- CPPUNIT_ASSERT_MESSAGE("int distance_to2", t1.distance_to(t9) == 0);
- CPPUNIT_ASSERT_MESSAGE("int distance_to3", t1.distance_to(t11) == 2);
- CPPUNIT_ASSERT_MESSAGE("int distance_to4", t1.distance_to(t8) == -1);
- CPPUNIT_ASSERT_MESSAGE("int distance_to5", t1.distance_to(t3) == -88);
- }
-
- void iterator_test()
- {
- typedef std::vector<char>::const_iterator test_it;
- const std::vector<char> hv(200,'x');
-
-
- test_it hit1 = hv.begin() + 12;
- test_it hit2 = hv.begin() + 88;
-
- range<test_it>
- t1(hit1, hit2);
- range<test_it>
- t2(hv.begin()+33, hv.begin()+33);
-
- // ctor
- CPPUNIT_ASSERT_MESSAGE("ivec ctor1", t1.begin() == hit1);
- CPPUNIT_ASSERT_MESSAGE("ivec ctor2", t1.end() == hit2);
- CPPUNIT_ASSERT_MESSAGE("ivec ctor3", t2.begin() == hv.begin()+33);
- CPPUNIT_ASSERT_MESSAGE("ivec ctor4", t2.end() == hv.begin()+33);
-
- // make_range
- CPPUNIT_ASSERT_MESSAGE("ivec make_range1", make_range(hv.begin(), hv.begin()+8).begin() == hv.begin());
- CPPUNIT_ASSERT_MESSAGE("ivec make_range2", make_range(hv.begin(), hv.begin()+8).end() == hv.begin()+8);
-
- // size
- CPPUNIT_ASSERT_MESSAGE("ivec size1", t1.size() == size_t(t1.end() - t1.begin()) );
- CPPUNIT_ASSERT_MESSAGE("ivec size2", t2.size() == size_t(0) );
-
- // contains
- range<test_it> t3(hv.begin(), hv.begin() + 10);
- range<test_it> t4(hv.begin() + 7, hv.begin() + 15);
- range<test_it> t5(hit1, hit1);
- range<test_it> t6(hv.begin() + 13, hv.begin() + 77);
- range<test_it> t7(hv.begin() + 87, hv.begin() + 87);
- range<test_it> t8(hv.begin() + 87, hit2);
- range<test_it> t9(hit2, hit2);
- range<test_it> t10(hv.begin() + 33, hv.begin() + 120);
- range<test_it> t11(hv.begin() + 90, hv.begin() + 100);
- range<test_it> t12(hv.begin() + 200,hv.begin() + 200);
-
- CPPUNIT_ASSERT_MESSAGE("ivec contains1", t1.contains(t1));
- CPPUNIT_ASSERT_MESSAGE("ivec contains2", t1.contains(t2));
- CPPUNIT_ASSERT_MESSAGE("ivec contains3", ! t1.contains(t3));
- CPPUNIT_ASSERT_MESSAGE("ivec contains4", ! t1.contains(t4));
- CPPUNIT_ASSERT_MESSAGE("ivec contains5", t1.contains(t5));
- CPPUNIT_ASSERT_MESSAGE("ivec contains6", t1.contains(t6));
- CPPUNIT_ASSERT_MESSAGE("ivec contains7", t1.contains(t7));
- CPPUNIT_ASSERT_MESSAGE("ivec contains8", t1.contains(t8));
- CPPUNIT_ASSERT_MESSAGE("ivec contains9", ! t1.contains(t9));
- CPPUNIT_ASSERT_MESSAGE("ivec contains10", ! t1.contains(t10));
- CPPUNIT_ASSERT_MESSAGE("ivec contains11", ! t1.contains(t11));
- CPPUNIT_ASSERT_MESSAGE("ivec contains12", ! t1.contains(t12));
-
- CPPUNIT_ASSERT_MESSAGE("ivec contains n1", t1.contains(hv.begin() + 50));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n2", t1.contains(hit1));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n3", t1.contains(hv.begin() + 87));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n4", ! t1.contains(hv.begin() + 3));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n5", ! t1.contains(hv.begin() + 11));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n6", ! t1.contains(hit2));
- CPPUNIT_ASSERT_MESSAGE("ivec contains n7", ! t1.contains(hv.begin() + 100));
-
- // overlaps
- range<test_it> t13(hit2, hv.begin() + 99);
-
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps1", t1.overlaps(t1));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps2", t1.overlaps(t2));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps3", ! t1.overlaps(t3));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps4", t1.overlaps(t4));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps5", t1.overlaps(t5));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps6", t1.overlaps(t6));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps7", t1.overlaps(t7));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps8", t1.overlaps(t8));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps9", ! t1.overlaps(t9));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps10", t1.overlaps(t10));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps11", ! t1.overlaps(t11));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps12", ! t1.overlaps(t12));
- CPPUNIT_ASSERT_MESSAGE("ivec overlaps13", ! t1.overlaps(t13));
-
- // distance_to
- CPPUNIT_ASSERT_MESSAGE("ivec distance_to1", t1.distance_to(t13) == 0);
- CPPUNIT_ASSERT_MESSAGE("ivec distance_to2", t1.distance_to(t8) == -1);
- CPPUNIT_ASSERT_MESSAGE("ivec distance_to3", t1.distance_to(t9) == 0);
- CPPUNIT_ASSERT_MESSAGE("ivec distance_to4", t1.distance_to(t11) == 2);
- CPPUNIT_ASSERT_MESSAGE("ivec distance_to5", t1.distance_to(t3) == -88);
-
- const std::vector< int* > h2(20, nullptr);
- std::deque< double > h3(30, 0.0);
-
- CPPUNIT_ASSERT_MESSAGE("range_of1", range_of(h2).begin() == h2.begin());
- CPPUNIT_ASSERT_MESSAGE("range_of2", range_of(h3).end() == h3.end());
- }
-
- // insert your test code here.
- void global()
- {
- int_test();
- iterator_test();
- }
-
-
- // These macros are needed by auto register mechanism.
- CPPUNIT_TEST_SUITE(range_test);
- CPPUNIT_TEST(global);
- CPPUNIT_TEST_SUITE_END();
-}; // class range_test
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION(range_test);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit de26372420224aabfaa11ddec9f89d4da76b38d7
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 29 13:24:57 2016 +0100
remove unneeded sal/config.h
Change-Id: I7c8f06574053706f925df773aefc32407312c4dd
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index c264c2f..0e88142 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_O3TL_ENUMARRAY_HXX
#define INCLUDED_O3TL_ENUMARRAY_HXX
-#include <sal/config.h>
#include <iterator>
#include <type_traits>
diff --git a/include/o3tl/enumrange.hxx b/include/o3tl/enumrange.hxx
index be0e223..5d8c369 100644
--- a/include/o3tl/enumrange.hxx
+++ b/include/o3tl/enumrange.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_O3TL_ENUMRANGE_HXX
#define INCLUDED_O3TL_ENUMRANGE_HXX
-#include <sal/config.h>
-
namespace o3tl {
///
diff --git a/include/o3tl/functional.hxx b/include/o3tl/functional.hxx
index b1341e2..439ed11 100644
--- a/include/o3tl/functional.hxx
+++ b/include/o3tl/functional.hxx
@@ -32,8 +32,6 @@
#ifndef INCLUDED_O3TL_COMPAT_FUNCTIONAL_HXX
#define INCLUDED_O3TL_COMPAT_FUNCTIONAL_HXX
-#include <sal/config.h>
-
namespace o3tl
{
/// Select first value of a pair
diff --git a/include/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx
index 40c2221..c596e13 100644
--- a/include/o3tl/lazy_update.hxx
+++ b/include/o3tl/lazy_update.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_O3TL_LAZY_UPDATE_HXX
#define INCLUDED_O3TL_LAZY_UPDATE_HXX
-#include <sal/config.h>
-
#include <utility>
namespace o3tl
diff --git a/include/o3tl/vector_pool.hxx b/include/o3tl/vector_pool.hxx
index b132289..1b94f31 100644
--- a/include/o3tl/vector_pool.hxx
+++ b/include/o3tl/vector_pool.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_O3TL_VECTOR_POOL_HXX
#define INCLUDED_O3TL_VECTOR_POOL_HXX
-#include <sal/types.h>
#include <vector>
namespace o3tl
More information about the Libreoffice-commits
mailing list