From 26b7326d7279d46fe05246a43eb71c8a2cfaef16 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 8 May 2017 20:48:22 +0100 Subject: [PATCH] Updated Code::Blocks project. Changed test project include paths to use unittest++ as sub-module. --- src/intrusive_flat_map.h | 1 - src/intrusive_flat_multimap.h | 3 +- src/intrusive_flat_multiset.h | 9 +- src/intrusive_flat_set.h | 9 +- test/ExtraCheckMacros.h | 16 +- test/codeblocks/ETL.cbp | 66 +- test/codeblocks/ETL.depend | 2520 ++++++++++++++----------- test/codeblocks/ETL.layout | 451 +---- test/keil/Test1.uvguix.John | 1995 ++++++-------------- test/keil/Test1.uvoptx | 1889 +++++++++++------- test/keil/Test1.uvprojx | 1001 ++++++---- test/main.cpp | 2 +- test/murmurhash3.h | 2 +- test/test_algorithm.cpp | 7 +- test/test_alignment.cpp | 6 +- test/test_array.cpp | 6 +- test/test_binary.cpp | 10 +- test/test_bitset.cpp | 4 +- test/test_bloom_filter.cpp | 14 +- test/test_bsd_checksum.cpp | 4 +- test/test_checksum.cpp | 6 +- test/test_container.cpp | 4 +- test/test_crc.cpp | 14 +- test/test_cyclic_value.cpp | 4 +- test/test_debounce.cpp | 4 +- test/test_deque.cpp | 4 +- test/test_endian.cpp | 4 +- test/test_enum_type.cpp | 4 +- test/test_error_handler.cpp | 6 +- test/test_exception.cpp | 4 +- test/test_fixed_iterator.cpp | 4 +- test/test_flat_map.cpp | 31 +- test/test_flat_multimap.cpp | 31 +- test/test_flat_multiset.cpp | 27 +- test/test_flat_set.cpp | 7 +- test/test_fnv_1.cpp | 4 +- test/test_forward_list.cpp | 4 +- test/test_function.cpp | 4 +- test/test_functional.cpp | 4 +- test/test_hash.cpp | 4 +- test/test_instance_count.cpp | 4 +- test/test_integral_limits.cpp | 4 +- test/test_intrusive_flat_map.cpp | 65 +- test/test_intrusive_flat_multimap.cpp | 35 +- test/test_intrusive_flat_multiset.cpp | 31 +- test/test_intrusive_flat_set.cpp | 7 +- test/test_intrusive_forward_list.cpp | 4 +- test/test_intrusive_links.cpp | 4 +- test/test_intrusive_list.cpp | 4 +- test/test_intrusive_queue.cpp | 6 +- test/test_intrusive_stack.cpp | 6 +- test/test_io_port.cpp | 7 +- test/test_iterator.cpp | 105 +- test/test_jenkins.cpp | 6 +- test/test_largest.cpp | 4 +- test/test_list.cpp | 4 +- test/test_map.cpp | 7 +- test/test_maths.cpp | 10 +- test/test_memory.cpp | 6 +- test/test_multimap.cpp | 4 +- test/test_multiset.cpp | 4 +- test/test_murmur3.cpp | 6 +- test/test_numeric.cpp | 4 +- test/test_observer.cpp | 4 +- test/test_optional.cpp | 6 +- test/test_pearson.cpp | 6 +- test/test_pool.cpp | 4 +- test/test_priority_queue.cpp | 4 +- test/test_queue.cpp | 4 +- test/test_random.cpp | 4 +- test/test_set.cpp | 4 +- test/test_smallest.cpp | 4 +- test/test_stack.cpp | 4 +- test/test_string_char.cpp | 4 +- test/test_string_u16.cpp | 4 +- test/test_string_u32.cpp | 4 +- test/test_string_wchar_t.cpp | 4 +- test/test_type_def.cpp | 4 +- test/test_type_traits.cpp | 4 +- test/test_unordered_map.cpp | 4 +- test/test_unordered_multimap.cpp | 4 +- test/test_unordered_multiset.cpp | 6 +- test/test_unordered_set.cpp | 6 +- test/test_utility.cpp | 4 +- test/test_variant.cpp | 4 +- test/test_vector.cpp | 4 +- test/test_vector_non_trivial.cpp | 4 +- test/test_vector_pointer.cpp | 4 +- test/test_visitor.cpp | 4 +- test/test_xor_checksum.cpp | 4 +- test/vs2017/etl.sln | 4 +- test/vs2017/etl.vcxproj | 7 +- test/vs2017/etl.vcxproj.filters | 3 - 93 files changed, 4216 insertions(+), 4440 deletions(-) diff --git a/src/intrusive_flat_map.h b/src/intrusive_flat_map.h index 4d1ead86..5f0108b8 100644 --- a/src/intrusive_flat_map.h +++ b/src/intrusive_flat_map.h @@ -102,7 +102,6 @@ namespace etl { public: - typedef size_t size_type; typedef std::pair value_type; private: diff --git a/src/intrusive_flat_multimap.h b/src/intrusive_flat_multimap.h index c95ec1e1..3e4ff28f 100644 --- a/src/intrusive_flat_multimap.h +++ b/src/intrusive_flat_multimap.h @@ -82,7 +82,6 @@ namespace etl public: typedef std::pair value_type; - typedef size_t size_type; private: @@ -859,4 +858,4 @@ namespace etl #undef ETL_FILE -#endif \ No newline at end of file +#endif diff --git a/src/intrusive_flat_multiset.h b/src/intrusive_flat_multiset.h index 0bef8e47..a4f7d323 100644 --- a/src/intrusive_flat_multiset.h +++ b/src/intrusive_flat_multiset.h @@ -278,11 +278,6 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - const_reference operator *() const { return *(*ilookup); @@ -647,7 +642,7 @@ namespace etl { return std::lower_bound(cbegin(), cend(), key, TKeyCompare()); } - + //********************************************************************* /// Finds the upper bound of a key ///\param key The key to search for. @@ -813,7 +808,7 @@ namespace etl private: typedef TKey value_type; - + // The vector that stores pointers to the nodes. etl::vector lookup; }; diff --git a/src/intrusive_flat_set.h b/src/intrusive_flat_set.h index f66a5c24..46a888b6 100644 --- a/src/intrusive_flat_set.h +++ b/src/intrusive_flat_set.h @@ -278,11 +278,6 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - const_reference operator *() const { return *(*ilookup); @@ -657,7 +652,7 @@ namespace etl { return std::lower_bound(cbegin(), cend(), key, TKeyCompare()); } - + //********************************************************************* /// Finds the upper bound of a key ///\param key The key to search for. @@ -823,7 +818,7 @@ namespace etl private: typedef TKey value_type; - + // The vector that stores pointers to the nodes. etl::vector lookup; }; diff --git a/test/ExtraCheckMacros.h b/test/ExtraCheckMacros.h index 20990f06..b8051f6a 100644 --- a/test/ExtraCheckMacros.h +++ b/test/ExtraCheckMacros.h @@ -1,14 +1,14 @@ #ifndef UNITTEST_EXTRA_CHECKMACROS_H #define UNITTEST_EXTRA_CHECKMACROS_H -#include -#include -#include -#include -#include -#include -#include -#include +#include "../unittest-cpp/UnitTest++/HelperMacros.h" +#include "../unittest-cpp/UnitTest++/ExceptionMacros.h" +#include "../unittest-cpp/UnitTest++/Checks.h" +#include "../unittest-cpp/UnitTest++/AssertException.h" +#include "../unittest-cpp/UnitTest++/MemoryOutStream.h" +#include "../unittest-cpp/UnitTest++/TestDetails.h" +#include "../unittest-cpp/UnitTest++/CurrentTest.h" +#include "../unittest-cpp/UnitTest++/ReportAssertImpl.h" #ifndef CHECK_NO_THROW #define CHECK_NO_THROW(expression) \ diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp index c5c03d8e..61bbedcc 100644 --- a/test/codeblocks/ETL.cbp +++ b/test/codeblocks/ETL.cbp @@ -13,12 +13,17 @@