Merge remote-tracking branch 'origin/development'

This commit is contained in:
John Wellbelove 2016-03-03 17:56:13 +00:00
commit d26a1d38fd
4 changed files with 972 additions and 496 deletions

View File

@ -22,10 +22,6 @@
<Add option="-DETL_VERBOSE_ERRORS" />
<Add option="-DETL_CHECK_PUSH_POP" />
</Compiler>
<ExtraCommands>
<Add after="bin\Debug\ETL.exe" />
<Mode after="always" />
</ExtraCommands>
</Target>
<Target title="Linux">
<Option output="bin/Debug/ETL" prefix_auto="1" extension_auto="1" />
@ -120,112 +116,111 @@
<Unit filename="../../../unittest-cpp/UnitTest++/Win32/TimeHelpers.h" />
<Unit filename="../../../unittest-cpp/UnitTest++/XmlTestReporter.cpp" />
<Unit filename="../../../unittest-cpp/UnitTest++/XmlTestReporter.h" />
<Unit filename="../../.gitattributes" />
<Unit filename="../../.gitignore" />
<Unit filename="../../Doxyfile" />
<Unit filename="../../LICENSE" />
<Unit filename="../../README.md" />
<Unit filename="../../alignment.h" />
<Unit filename="../../array.h" />
<Unit filename="../../binary.h" />
<Unit filename="../../bitset.h" />
<Unit filename="../../bloom_filter.h" />
<Unit filename="../../container.h" />
<Unit filename="../../crc16.cpp" />
<Unit filename="../../crc16.h" />
<Unit filename="../../crc16_ccitt.cpp" />
<Unit filename="../../crc16_ccitt.h" />
<Unit filename="../../crc16_kermit.cpp" />
<Unit filename="../../crc16_kermit.h" />
<Unit filename="../../crc32.cpp" />
<Unit filename="../../crc32.h" />
<Unit filename="../../crc64_ecma.cpp" />
<Unit filename="../../crc64_ecma.h" />
<Unit filename="../../crc8_ccitt.cpp" />
<Unit filename="../../crc8_ccitt.h" />
<Unit filename="../../cyclic_value.h" />
<Unit filename="../../deque.h" />
<Unit filename="../../doxygen.h" />
<Unit filename="../../endian.h" />
<Unit filename="../../enum_type.h" />
<Unit filename="../../error_handler.cpp" />
<Unit filename="../../error_handler.h" />
<Unit filename="../../etl.jpg" />
<Unit filename="../../exception.h" />
<Unit filename="../../factorial.h" />
<Unit filename="../../fibonacci.h" />
<Unit filename="../../flat_map.h" />
<Unit filename="../../flat_map_base.h" />
<Unit filename="../../flat_set.h" />
<Unit filename="../../flat_set_base.h" />
<Unit filename="../../forward_list.h" />
<Unit filename="../../forward_list_base.h" />
<Unit filename="../../function.h" />
<Unit filename="../../functional.h" />
<Unit filename="../../ibitset.h" />
<Unit filename="../../ideque.h" />
<Unit filename="../../iflat_map.h" />
<Unit filename="../../iflat_set.h" />
<Unit filename="../../iforward_list.h" />
<Unit filename="../../ihash.h" />
<Unit filename="../../ilist.h" />
<Unit filename="../../imap.h" />
<Unit filename="../../instance_count.h" />
<Unit filename="../../integral_limits.h" />
<Unit filename="../../intrusive_forward_list.h" />
<Unit filename="../../intrusive_forward_list_link.h" />
<Unit filename="../../io_port.h" />
<Unit filename="../../iqueue.h" />
<Unit filename="../../iset.h" />
<Unit filename="../../istack.h" />
<Unit filename="../../iunordered_map.h" />
<Unit filename="../../ivector.h" />
<Unit filename="../../largest.h" />
<Unit filename="../../list.h" />
<Unit filename="../../list_base.h" />
<Unit filename="../../log.h" />
<Unit filename="../../lookup.h" />
<Unit filename="../../lookup_base.h" />
<Unit filename="../../map.h" />
<Unit filename="../../map_base.h" />
<Unit filename="../../nullptr.h" />
<Unit filename="../../numeric.h" />
<Unit filename="../../observer.h" />
<Unit filename="../../optional.h" />
<Unit filename="../../parameter_type.h" />
<Unit filename="../../pool.h" />
<Unit filename="../../power.h" />
<Unit filename="../../private/deque_base.h" />
<Unit filename="../../private/flat_map_base.h" />
<Unit filename="../../private/flat_multimap_base.h" />
<Unit filename="../../private/flat_multiset_base.h" />
<Unit filename="../../private/flat_set_base.h" />
<Unit filename="../../private/forward_list_base.h" />
<Unit filename="../../private/list_base.h" />
<Unit filename="../../private/map_base.h" />
<Unit filename="../../private/multimap_base.h" />
<Unit filename="../../private/multiset_base.h" />
<Unit filename="../../private/pool_base.h" />
<Unit filename="../../private/priority_queue_base.h" />
<Unit filename="../../private/queue_base.h" />
<Unit filename="../../private/set_base.h" />
<Unit filename="../../private/stack_base.h" />
<Unit filename="../../private/unordered_map_base.h" />
<Unit filename="../../private/vector_base.h" />
<Unit filename="../../queue.h" />
<Unit filename="../../queue_base.h" />
<Unit filename="../../set.h" />
<Unit filename="../../set_base.h" />
<Unit filename="../../smallest.h" />
<Unit filename="../../stack.h" />
<Unit filename="../../stack_base.h" />
<Unit filename="../../static_assert.h" />
<Unit filename="../../type_traits.h" />
<Unit filename="../../unordered_map.h" />
<Unit filename="../../variant.h" />
<Unit filename="../../vector.h" />
<Unit filename="../../vector_base.h" />
<Unit filename="../../visitor.h" />
<Unit filename="../../src/algorithm.h" />
<Unit filename="../../src/alignment.h" />
<Unit filename="../../src/array.h" />
<Unit filename="../../src/binary.h" />
<Unit filename="../../src/bitset.h" />
<Unit filename="../../src/bloom_filter.h" />
<Unit filename="../../src/char_traits.h" />
<Unit filename="../../src/checksum.h" />
<Unit filename="../../src/container.h" />
<Unit filename="../../src/crc16.cpp" />
<Unit filename="../../src/crc16.h" />
<Unit filename="../../src/crc16_ccitt.cpp" />
<Unit filename="../../src/crc16_ccitt.h" />
<Unit filename="../../src/crc16_kermit.cpp" />
<Unit filename="../../src/crc16_kermit.h" />
<Unit filename="../../src/crc32.cpp" />
<Unit filename="../../src/crc32.h" />
<Unit filename="../../src/crc64_ecma.cpp" />
<Unit filename="../../src/crc64_ecma.h" />
<Unit filename="../../src/crc8_ccitt.cpp" />
<Unit filename="../../src/crc8_ccitt.h" />
<Unit filename="../../src/cyclic_hash.h" />
<Unit filename="../../src/cyclic_value.h" />
<Unit filename="../../src/deque.h" />
<Unit filename="../../src/endian.h" />
<Unit filename="../../src/enum_type.h" />
<Unit filename="../../src/error_handler.cpp" />
<Unit filename="../../src/error_handler.h" />
<Unit filename="../../src/etl_arduino.h" />
<Unit filename="../../src/exception.h" />
<Unit filename="../../src/factorial.h" />
<Unit filename="../../src/fibonacci.h" />
<Unit filename="../../src/fixed_iterator.h" />
<Unit filename="../../src/flat_map.h" />
<Unit filename="../../src/flat_multimap.h" />
<Unit filename="../../src/flat_multiset.h" />
<Unit filename="../../src/flat_set.h" />
<Unit filename="../../src/fnv_1.h" />
<Unit filename="../../src/forward_list.h" />
<Unit filename="../../src/frame_check_sequence.h" />
<Unit filename="../../src/function.h" />
<Unit filename="../../src/functional.h" />
<Unit filename="../../src/hash.h" />
<Unit filename="../../src/ibitset.h" />
<Unit filename="../../src/ideque.h" />
<Unit filename="../../src/iflat_map.h" />
<Unit filename="../../src/iflat_multimap.h" />
<Unit filename="../../src/iflat_multiset.h" />
<Unit filename="../../src/iflat_set.h" />
<Unit filename="../../src/iforward_list.h" />
<Unit filename="../../src/ihash.h" />
<Unit filename="../../src/ilist.h" />
<Unit filename="../../src/imap.h" />
<Unit filename="../../src/imultimap.h" />
<Unit filename="../../src/imultiset.h" />
<Unit filename="../../src/instance_count.h" />
<Unit filename="../../src/integral_limits.h" />
<Unit filename="../../src/intrusive_forward_list.h" />
<Unit filename="../../src/intrusive_forward_list_link.h" />
<Unit filename="../../src/intrusive_links.h" />
<Unit filename="../../src/intrusive_list.h" />
<Unit filename="../../src/io_port.h" />
<Unit filename="../../src/ipool.h" />
<Unit filename="../../src/ipriority_queue.h" />
<Unit filename="../../src/iqueue.h" />
<Unit filename="../../src/iset.h" />
<Unit filename="../../src/istack.h" />
<Unit filename="../../src/iunordered_map.h" />
<Unit filename="../../src/iunordered_multimap.h" />
<Unit filename="../../src/iunordered_multiset.h" />
<Unit filename="../../src/iunordered_set.h" />
<Unit filename="../../src/ivector.h" />
<Unit filename="../../src/jenkins.h" />
<Unit filename="../../src/largest.h" />
<Unit filename="../../src/list.h" />
<Unit filename="../../src/log.h" />
<Unit filename="../../src/map.h" />
<Unit filename="../../src/multimap.h" />
<Unit filename="../../src/multiset.h" />
<Unit filename="../../src/murmur3.h" />
<Unit filename="../../src/nullptr.h" />
<Unit filename="../../src/numeric.h" />
<Unit filename="../../src/observer.h" />
<Unit filename="../../src/optional.h" />
<Unit filename="../../src/parameter_type.h" />
<Unit filename="../../src/pearson.cpp" />
<Unit filename="../../src/pearson.h" />
<Unit filename="../../src/pool.h" />
<Unit filename="../../src/power.h" />
<Unit filename="../../src/priority_queue.h" />
<Unit filename="../../src/queue.h" />
<Unit filename="../../src/radix.h" />
<Unit filename="../../src/set.h" />
<Unit filename="../../src/smallest.h" />
<Unit filename="../../src/stack.h" />
<Unit filename="../../src/static_assert.h" />
<Unit filename="../../src/string.h" />
<Unit filename="../../src/type_traits.h" />
<Unit filename="../../src/unordered_map.h" />
<Unit filename="../../src/unordered_multimap.h" />
<Unit filename="../../src/unordered_multiset.h" />
<Unit filename="../../src/unordered_set.h" />
<Unit filename="../../src/variant.h" />
<Unit filename="../../src/vector.h" />
<Unit filename="../../src/visitor.h" />
<Unit filename="../ExtraCheckMacros.h" />
<Unit filename="../main.cpp" />
<Unit filename="../test_algorithm.cpp" />

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Windows" />
<File name="..\..\pool.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\iqueue.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2334" topLine="35" />
<Cursor1 position="5008" topLine="60" />
</Cursor>
</File>
<File name="..\test_map.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -11,199 +11,14 @@
<Cursor1 position="4405" topLine="112" />
</Cursor>
</File>
<File name="..\test_hash.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_optional.cpp" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4733" topLine="114" />
<Cursor1 position="3050" topLine="59" />
</Cursor>
</File>
<File name="..\..\private\flat_map_base.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\observer.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1579" topLine="0" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1247" topLine="2" />
</Cursor>
</File>
<File name="..\..\imap.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="50514" topLine="1440" />
</Cursor>
</File>
<File name="..\test_array.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1346" topLine="0" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="692" topLine="0" />
</Cursor>
</File>
<File name="..\..\map.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5955" topLine="137" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="469" topLine="0" />
</Cursor>
</File>
<File name="..\..\array.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1998" topLine="258" />
</Cursor>
</File>
<File name="..\test_alignment.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1554" topLine="0" />
</Cursor>
</File>
<File name="..\..\lookup.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3734" topLine="55" />
</Cursor>
</File>
<File name="..\..\nullptr.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="560" topLine="9" />
</Cursor>
</File>
<File name="..\..\private\vector_base.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1551" topLine="0" />
</Cursor>
</File>
<File name="..\..\iset.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="48031" topLine="1364" />
</Cursor>
</File>
<File name="..\test_variant.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="11763" topLine="384" />
</Cursor>
</File>
<File name="..\test_deque.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="21475" topLine="641" />
</Cursor>
</File>
<File name="..\..\private\set_base.h" open="0" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5234" topLine="132" />
</Cursor>
</File>
<File name="..\..\container.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2523" topLine="42" />
</Cursor>
</File>
<File name="..\test_cyclic_value.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1365" topLine="12" />
</Cursor>
</File>
<File name="..\..\error_handler.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4037" topLine="53" />
</Cursor>
</File>
<File name="..\..\stack.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3203" topLine="57" />
</Cursor>
</File>
<File name="..\..\endian.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2235" topLine="37" />
</Cursor>
</File>
<File name="..\..\alignment.h" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5607" topLine="134" />
</Cursor>
</File>
<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1356" topLine="10" />
</Cursor>
</File>
<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1603" topLine="28" />
</Cursor>
</File>
<File name="..\..\private\flat_multimap_base.h" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1604" topLine="0" />
</Cursor>
</File>
<File name="..\test_binary.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1534" topLine="0" />
</Cursor>
</File>
<File name="..\test_forward_list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3881" topLine="77" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1865" topLine="28" />
</Cursor>
</File>
<File name="..\test_error_handler.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2501" topLine="42" />
</Cursor>
</File>
<File name="..\test_algorithm.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1524" topLine="0" />
</Cursor>
</File>
<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4670" topLine="110" />
</Cursor>
</File>
<File name="..\..\private\deque_base.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="..\..\ideque.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="29778" topLine="887" />
</Cursor>
</File>
<File name="..\..\integral_limits.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2272" topLine="36" />
</Cursor>
</File>
<File name="..\..\queue.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2984" topLine="48" />
</Cursor>
</File>
<File name="..\..\list.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4072" topLine="77" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="662" topLine="0" />
</Cursor>
</File>
<File name="..\..\io_port.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2314" topLine="48" />
<Cursor1 position="4997" topLine="66" />
</Cursor>
</File>
<File name="..\test_integral_limits.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -211,39 +26,29 @@
<Cursor1 position="1416" topLine="13" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="773" topLine="0" />
<Cursor1 position="257" topLine="0" />
</Cursor>
</File>
<File name="..\..\type_traits.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\ipool.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="11681" topLine="241" />
<Cursor1 position="12290" topLine="320" />
</Cursor>
</File>
<File name="..\test_exception.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_cyclic_value.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2419" topLine="15" />
<Cursor1 position="1365" topLine="12" />
</Cursor>
</File>
<File name="..\..\binary.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_intrusive_forward_list.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="18374" topLine="466" />
<Cursor1 position="1679" topLine="0" />
</Cursor>
</File>
<File name="..\..\optional.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\ivector.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2746" topLine="58" />
</Cursor>
</File>
<File name="..\..\Doxyfile" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="56760" topLine="1251" />
</Cursor>
</File>
<File name="..\test_bitset.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1601" topLine="0" />
<Cursor1 position="10520" topLine="236" />
</Cursor>
</File>
<File name="..\test_type_traits.cpp" open="0" top="0" tabpos="30" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -251,44 +56,94 @@
<Cursor1 position="30352" topLine="372" />
</Cursor>
</File>
<File name="..\..\vector.h" open="0" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4075" topLine="67" />
<Cursor1 position="692" topLine="0" />
</Cursor>
</File>
<File name="..\..\function.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_error_handler.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3693" topLine="67" />
<Cursor1 position="2501" topLine="42" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="257" topLine="0" />
<Cursor1 position="773" topLine="0" />
</Cursor>
</File>
<File name="..\test_io_port.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_variant.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2724" topLine="58" />
<Cursor1 position="11763" topLine="384" />
</Cursor>
</File>
<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6486" topLine="208" />
<Cursor1 position="662" topLine="0" />
</Cursor>
</File>
<File name="..\test_set.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_bitset.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5885" topLine="199" />
<Cursor1 position="1601" topLine="0" />
</Cursor>
</File>
<File name="..\test_list.cpp" open="1" top="1" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_hash.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="29671" topLine="878" />
<Cursor1 position="4733" topLine="114" />
</Cursor>
</File>
<File name="..\..\ilist.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_alignment.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="17660" topLine="539" />
<Cursor1 position="1554" topLine="0" />
</Cursor>
</File>
<File name="..\..\src\vector.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3110" topLine="24" />
</Cursor>
</File>
<File name="..\..\src\crc32.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3389" topLine="44" />
</Cursor>
</File>
<File name="..\..\src\crc64_ecma.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3458" topLine="44" />
</Cursor>
</File>
<File name="..\..\src\crc8_ccitt.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2436" topLine="15" />
</Cursor>
</File>
<File name="..\..\src\ilist.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="16337" topLine="489" />
</Cursor>
</File>
<File name="..\test_vector.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="9922" topLine="306" />
</Cursor>
</File>
<File name="..\..\src\imap.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="22839" topLine="636" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1865" topLine="28" />
</Cursor>
</File>
<File name="..\..\src\intrusive_links.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="20132" topLine="663" />
</Cursor>
</File>
<File name="..\..\src\intrusive_forward_list.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="16457" topLine="442" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -296,19 +151,129 @@
<Cursor1 position="2020" topLine="25" />
</Cursor>
</File>
<File name="..\..\private\multiset_base.h" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_list.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5342" topLine="125" />
<Cursor1 position="40851" topLine="1166" />
</Cursor>
</File>
<File name="..\..\cyclic_value.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\istack.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3578" topLine="85" />
<Cursor1 position="2266" topLine="38" />
</Cursor>
</File>
<File name="..\test_optional.cpp" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\test_forward_list.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3050" topLine="59" />
<Cursor1 position="3941" topLine="77" />
</Cursor>
</File>
<File name="..\..\src\bloom_filter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3800" topLine="75" />
</Cursor>
</File>
<File name="..\..\src\iunordered_map.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="25812" topLine="704" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="469" topLine="0" />
</Cursor>
</File>
<File name="..\test_array.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1346" topLine="0" />
</Cursor>
</File>
<File name="..\..\src\optional.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="8753" topLine="220" />
</Cursor>
</File>
<File name="..\test_io_port.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2724" topLine="58" />
</Cursor>
</File>
<File name="..\..\src\frame_check_sequence.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="76" />
</Cursor>
</File>
<File name="..\..\src\crc16_ccitt.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3464" topLine="44" />
</Cursor>
</File>
<File name="..\test_deque.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="21475" topLine="641" />
</Cursor>
</File>
<File name="..\test_exception.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2419" topLine="15" />
</Cursor>
</File>
<File name="..\test_set.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5885" topLine="199" />
</Cursor>
</File>
<File name="..\..\src\checksum.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6114" topLine="139" />
</Cursor>
</File>
<File name="..\..\src\variant.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="36593" topLine="842" />
</Cursor>
</File>
<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1247" topLine="2" />
</Cursor>
</File>
<File name="..\..\src\crc16_kermit.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3458" topLine="44" />
</Cursor>
</File>
<File name="..\test_binary.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1534" topLine="0" />
</Cursor>
</File>
<File name="..\test_bloom_filter.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6486" topLine="208" />
</Cursor>
</File>
<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1603" topLine="28" />
</Cursor>
</File>
<File name="..\test_algorithm.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1524" topLine="0" />
</Cursor>
</File>
<File name="..\..\src\binary.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="19509" topLine="464" />
</Cursor>
</File>
<File name="..\..\src\iset.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="20665" topLine="581" />
</Cursor>
</File>
<File name="..\..\src\crc16.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3363" topLine="44" />
</Cursor>
</File>
</CodeBlocks_layout_file>

View File

@ -924,7 +924,7 @@ namespace
are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
CHECK(are_equal);
// Move to the end.
compare_data.assign(unsorted_data.begin(), unsorted_data.end());
compare_data2.assign(unsorted_data.begin(), unsorted_data.end());
@ -1173,48 +1173,6 @@ namespace
are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
CHECK(are_equal);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_splice_list_same)
{
CompareData compare_data(unsorted_data.begin(), unsorted_data.end());
DataNDC data(unsorted_data.begin(), unsorted_data.end());
CompareData::iterator compare_to;
DataNDC::iterator to;
// Move to the beginning.
compare_to = compare_data.begin();
compare_data.splice(compare_to, compare_data);
to = data.begin();
data.splice(to, data);
are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
CHECK(are_equal);
// Move to the end.
compare_to = compare_data.end();
compare_data.splice(compare_to, compare_data);
to = data.end();
data.splice(to, data);
are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
CHECK(are_equal);
// Move nearby.
compare_to = compare_data.begin();
std::advance(compare_to, 7);
compare_data.splice(compare_to, compare_data);
to = data.begin();
std::advance(to, 7);
data.splice(to, data);
are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
CHECK(are_equal);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_splice_list_different)
@ -1240,7 +1198,7 @@ namespace
are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
CHECK(are_equal);
// Move to the end.
compare_data.assign(unsorted_data.begin(), unsorted_data.end());
compare_data2.assign(unsorted_data.begin(), unsorted_data.end());