Merge remote-tracking branch 'origin/development'

ETLCPP · Feb 28, 2016 · 6104b66 · 6104b66
2 parents 1fdd5bd + b7da660
commit 6104b66
Show file tree

Hide file tree

Showing 183 changed files with 129 additions and 122 deletions.
diff --git a/library.properties b/library.properties
@@ -0,0 +1,9 @@
+name=Embedded Template Library
+version=8.0.0
+author= John Wellbelove <john.wellbelove@etlcpp.com>
+maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
+sentence=A C++ template library tailored for embedded systems.
+paragraph=Requires some support from STL. See http://andybrown.me.uk/2011/01/15/the-standard-template-library-stl-for-avr-with-c-streams/
+category=Other
+url=http://www.etlcpp.com/
+architectures=* 
diff --git a/algorithm.h → src/algorithm.h b/algorithm.h → src/algorithm.h
diff --git a/alignment.h → src/alignment.h b/alignment.h → src/alignment.h
diff --git a/array.h → src/array.h b/array.h → src/array.h
diff --git a/basic_string.h → src/basic_string.h b/basic_string.h → src/basic_string.h
diff --git a/binary.h → src/binary.h b/binary.h → src/binary.h
diff --git a/bitset.h → src/bitset.h b/bitset.h → src/bitset.h
diff --git a/bloom_filter.h → src/bloom_filter.h b/bloom_filter.h → src/bloom_filter.h
diff --git a/char_traits.h → src/char_traits.h b/char_traits.h → src/char_traits.h
diff --git a/checksum.h → src/checksum.h b/checksum.h → src/checksum.h
diff --git a/container.h → src/container.h b/container.h → src/container.h
diff --git a/crc16.cpp → src/crc16.cpp b/crc16.cpp → src/crc16.cpp
diff --git a/crc16.h → src/crc16.h b/crc16.h → src/crc16.h
diff --git a/crc16_ccitt.cpp → src/crc16_ccitt.cpp b/crc16_ccitt.cpp → src/crc16_ccitt.cpp
diff --git a/crc16_ccitt.h → src/crc16_ccitt.h b/crc16_ccitt.h → src/crc16_ccitt.h
diff --git a/crc16_kermit.cpp → src/crc16_kermit.cpp b/crc16_kermit.cpp → src/crc16_kermit.cpp
diff --git a/crc16_kermit.h → src/crc16_kermit.h b/crc16_kermit.h → src/crc16_kermit.h
diff --git a/crc32.cpp → src/crc32.cpp b/crc32.cpp → src/crc32.cpp
diff --git a/crc32.h → src/crc32.h b/crc32.h → src/crc32.h
diff --git a/crc64_ecma.cpp → src/crc64_ecma.cpp b/crc64_ecma.cpp → src/crc64_ecma.cpp
diff --git a/crc64_ecma.h → src/crc64_ecma.h b/crc64_ecma.h → src/crc64_ecma.h
diff --git a/crc8_ccitt.cpp → src/crc8_ccitt.cpp b/crc8_ccitt.cpp → src/crc8_ccitt.cpp
diff --git a/crc8_ccitt.h → src/crc8_ccitt.h b/crc8_ccitt.h → src/crc8_ccitt.h
diff --git a/cyclic_hash.h → src/cyclic_hash.h b/cyclic_hash.h → src/cyclic_hash.h
diff --git a/cyclic_value.h → src/cyclic_value.h b/cyclic_value.h → src/cyclic_value.h
diff --git a/deque.h → src/deque.h b/deque.h → src/deque.h
diff --git a/doxygen.h → src/doxygen.h b/doxygen.h → src/doxygen.h
diff --git a/endian.h → src/endian.h b/endian.h → src/endian.h
diff --git a/enum_type.h → src/enum_type.h b/enum_type.h → src/enum_type.h
diff --git a/error_handler.cpp → src/error_handler.cpp b/error_handler.cpp → src/error_handler.cpp
diff --git a/error_handler.h → src/error_handler.h b/error_handler.h → src/error_handler.h
diff --git a/etl_arduino.h → src/etl_arduino.h b/etl_arduino.h → src/etl_arduino.h
diff --git a/exception.h → src/exception.h b/exception.h → src/exception.h
diff --git a/factorial.h → src/factorial.h b/factorial.h → src/factorial.h
diff --git a/fibonacci.h → src/fibonacci.h b/fibonacci.h → src/fibonacci.h
diff --git a/fixed_iterator.h → src/fixed_iterator.h b/fixed_iterator.h → src/fixed_iterator.h
diff --git a/flat_map.h → src/flat_map.h b/flat_map.h → src/flat_map.h
diff --git a/flat_multimap.h → src/flat_multimap.h b/flat_multimap.h → src/flat_multimap.h
diff --git a/flat_multiset.h → src/flat_multiset.h b/flat_multiset.h → src/flat_multiset.h
diff --git a/flat_set.h → src/flat_set.h b/flat_set.h → src/flat_set.h
diff --git a/fnv_1.h → src/fnv_1.h b/fnv_1.h → src/fnv_1.h
diff --git a/forward_list.h → src/forward_list.h b/forward_list.h → src/forward_list.h
diff --git a/frame_check_sequence.h → src/frame_check_sequence.h b/frame_check_sequence.h → src/frame_check_sequence.h
diff --git a/function.h → src/function.h b/function.h → src/function.h
diff --git a/functional.h → src/functional.h b/functional.h → src/functional.h
diff --git a/hash.h → src/hash.h b/hash.h → src/hash.h
diff --git a/ibitset.h → src/ibitset.h b/ibitset.h → src/ibitset.h
diff --git a/ideque.h → src/ideque.h b/ideque.h → src/ideque.h
diff --git a/iflat_map.h → src/iflat_map.h b/iflat_map.h → src/iflat_map.h
diff --git a/iflat_multimap.h → src/iflat_multimap.h b/iflat_multimap.h → src/iflat_multimap.h
diff --git a/iflat_multiset.h → src/iflat_multiset.h b/iflat_multiset.h → src/iflat_multiset.h
diff --git a/iflat_set.h → src/iflat_set.h b/iflat_set.h → src/iflat_set.h
diff --git a/iforward_list.h → src/iforward_list.h b/iforward_list.h → src/iforward_list.h
diff --git a/ihash.h → src/ihash.h b/ihash.h → src/ihash.h
diff --git a/ilist.h → src/ilist.h b/ilist.h → src/ilist.h
diff --git a/imap.h → src/imap.h b/imap.h → src/imap.h
diff --git a/imultimap.h → src/imultimap.h b/imultimap.h → src/imultimap.h
diff --git a/imultiset.h → src/imultiset.h b/imultiset.h → src/imultiset.h
diff --git a/instance_count.h → src/instance_count.h b/instance_count.h → src/instance_count.h
diff --git a/integral_limits.h → src/integral_limits.h b/integral_limits.h → src/integral_limits.h
diff --git a/intrusive_forward_list.h → src/intrusive_forward_list.h b/intrusive_forward_list.h → src/intrusive_forward_list.h
diff --git a/intrusive_forward_list_link.h → src/intrusive_forward_list_link.h b/intrusive_forward_list_link.h → src/intrusive_forward_list_link.h
diff --git a/intrusive_links.h → src/intrusive_links.h b/intrusive_links.h → src/intrusive_links.h
diff --git a/intrusive_list.h → src/intrusive_list.h b/intrusive_list.h → src/intrusive_list.h
diff --git a/io_port.h → src/io_port.h b/io_port.h → src/io_port.h
diff --git a/ipool.h → src/ipool.h b/ipool.h → src/ipool.h
diff --git a/ipriority_queue.h → src/ipriority_queue.h b/ipriority_queue.h → src/ipriority_queue.h
@@ -37,15 +37,13 @@ SOFTWARE.
 #include "type_traits.h"
 #include "parameter_type.h"
 #include "error_handler.h"
-
-namespace etl
-{
-#include "../exception.h"
-#include "../error_handler.h"
+#include "exception.h"
 
 #undef ETL_FILE
 #define ETL_FILE "12"
 
+namespace etl
+{
   //***************************************************************************
   /// The base class for priority_queue exceptions.
   ///\ingroup queue

diff --git a/iqueue.h → src/iqueue.h b/iqueue.h → src/iqueue.h
diff --git a/iset.h → src/iset.h b/iset.h → src/iset.h
diff --git a/istack.h → src/istack.h b/istack.h → src/istack.h
diff --git a/iunordered_map.h → src/iunordered_map.h b/iunordered_map.h → src/iunordered_map.h
diff --git a/iunordered_multimap.h → src/iunordered_multimap.h b/iunordered_multimap.h → src/iunordered_multimap.h
diff --git a/iunordered_multiset.h → src/iunordered_multiset.h b/iunordered_multiset.h → src/iunordered_multiset.h
diff --git a/iunordered_set.h → src/iunordered_set.h b/iunordered_set.h → src/iunordered_set.h
diff --git a/ivector.h → src/ivector.h b/ivector.h → src/ivector.h
diff --git a/jenkins.h → src/jenkins.h b/jenkins.h → src/jenkins.h
diff --git a/largest.h → src/largest.h b/largest.h → src/largest.h
diff --git a/list.h → src/list.h b/list.h → src/list.h
diff --git a/log.h → src/log.h b/log.h → src/log.h
diff --git a/map.h → src/map.h b/map.h → src/map.h
diff --git a/multimap.h → src/multimap.h b/multimap.h → src/multimap.h
diff --git a/multiset.h → src/multiset.h b/multiset.h → src/multiset.h
diff --git a/murmur3.h → src/murmur3.h b/murmur3.h → src/murmur3.h
diff --git a/nullptr.h → src/nullptr.h b/nullptr.h → src/nullptr.h
diff --git a/numeric.h → src/numeric.h b/numeric.h → src/numeric.h
diff --git a/observer.h → src/observer.h b/observer.h → src/observer.h
diff --git a/optional.h → src/optional.h b/optional.h → src/optional.h
diff --git a/parameter_type.h → src/parameter_type.h b/parameter_type.h → src/parameter_type.h
diff --git a/pearson.cpp → src/pearson.cpp b/pearson.cpp → src/pearson.cpp
diff --git a/pearson.h → src/pearson.h b/pearson.h → src/pearson.h
diff --git a/pool.h → src/pool.h b/pool.h → src/pool.h
diff --git a/power.h → src/power.h b/power.h → src/power.h
diff --git a/priority_queue.h → src/priority_queue.h b/priority_queue.h → src/priority_queue.h
diff --git a/private/deque_base.h → src/private/deque_base.h b/private/deque_base.h → src/private/deque_base.h
diff --git a/private/flat_map_base.h → src/private/flat_map_base.h b/private/flat_map_base.h → src/private/flat_map_base.h
diff --git a/private/flat_multimap_base.h → src/private/flat_multimap_base.h b/private/flat_multimap_base.h → src/private/flat_multimap_base.h
diff --git a/private/flat_multiset_base.h → src/private/flat_multiset_base.h b/private/flat_multiset_base.h → src/private/flat_multiset_base.h
diff --git a/private/flat_set_base.h → src/private/flat_set_base.h b/private/flat_set_base.h → src/private/flat_set_base.h
diff --git a/private/forward_list_base.h → src/private/forward_list_base.h b/private/forward_list_base.h → src/private/forward_list_base.h
diff --git a/private/list_base.h → src/private/list_base.h b/private/list_base.h → src/private/list_base.h
diff --git a/private/map_base.h → src/private/map_base.h b/private/map_base.h → src/private/map_base.h
diff --git a/private/multimap_base.h → src/private/multimap_base.h b/private/multimap_base.h → src/private/multimap_base.h
diff --git a/private/multiset_base.h → src/private/multiset_base.h b/private/multiset_base.h → src/private/multiset_base.h
diff --git a/private/pool_base.h → src/private/pool_base.h b/private/pool_base.h → src/private/pool_base.h
diff --git a/private/queue_base.h → src/private/queue_base.h b/private/queue_base.h → src/private/queue_base.h
diff --git a/private/set_base.h → src/private/set_base.h b/private/set_base.h → src/private/set_base.h
diff --git a/private/stack_base.h → src/private/stack_base.h b/private/stack_base.h → src/private/stack_base.h
diff --git a/private/vector_base.h → src/private/vector_base.h b/private/vector_base.h → src/private/vector_base.h
diff --git a/queue.h → src/queue.h b/queue.h → src/queue.h
diff --git a/radix.h → src/radix.h b/radix.h → src/radix.h
diff --git a/set.h → src/set.h b/set.h → src/set.h
diff --git a/smallest.h → src/smallest.h b/smallest.h → src/smallest.h
diff --git a/stack.h → src/stack.h b/stack.h → src/stack.h
diff --git a/static_assert.h → src/static_assert.h b/static_assert.h → src/static_assert.h
diff --git a/type_traits.h → src/type_traits.h b/type_traits.h → src/type_traits.h
diff --git a/unordered_map.h → src/unordered_map.h b/unordered_map.h → src/unordered_map.h
diff --git a/unordered_multimap.h → src/unordered_multimap.h b/unordered_multimap.h → src/unordered_multimap.h
diff --git a/unordered_multiset.h → src/unordered_multiset.h b/unordered_multiset.h → src/unordered_multiset.h
diff --git a/unordered_set.h → src/unordered_set.h b/unordered_set.h → src/unordered_set.h
diff --git a/variant.h → src/variant.h b/variant.h → src/variant.h
diff --git a/vector.h → src/vector.h b/vector.h → src/vector.h
diff --git a/visitor.h → src/visitor.h b/visitor.h → src/visitor.h
diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
@@ -28,8 +28,8 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../algorithm.h"
-#include "../container.h"
+#include "../src/algorithm.h"
+#include "../src/container.h"
 
 #include <vector>
 #include <algorithm>

diff --git a/test/test_alignment.cpp b/test/test_alignment.cpp
@@ -28,8 +28,8 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../alignment.h"
-#include "../type_traits.h"
+#include "../src/alignment.h"
+#include "../src/type_traits.h"
 
 #include <type_traits>
 #include <utility>

diff --git a/test/test_array.cpp b/test/test_array.cpp
@@ -28,13 +28,13 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../array.h"
+#include "../src/array.h"
 
 #include <array>
 #include <algorithm>
 #include <iterator>
 
-#include "../integral_limits.h"
+#include "../src/integral_limits.h"
 
 namespace
 {

diff --git a/test/test_binary.cpp b/test/test_binary.cpp
@@ -31,10 +31,10 @@ SOFTWARE.
 #include <cstdint>
 #include <type_traits>
 
-#include "../binary.h"
-#include "../bitset.h"
-#include "../fnv_1.h"
-#include "../integral_limits.h"
+#include "../src/binary.h"
+#include "../src/bitset.h"
+#include "../src/fnv_1.h"
+#include "../src/integral_limits.h"
 
 #undef max
 

diff --git a/test/test_bitset.cpp b/test/test_bitset.cpp
@@ -34,7 +34,7 @@ SOFTWARE.
 
 #define ETL_IN_UNIT_TEST
 
-#include "../bitset.h"
+#include "../src/bitset.h"
 
 #undef min
 #undef max

diff --git a/test/test_bloom_filter.cpp b/test/test_bloom_filter.cpp
@@ -31,12 +31,12 @@ SOFTWARE.
 #include <stdlib.h>
 #include <vector>
 
-#include "../bloom_filter.h"
+#include "../src/bloom_filter.h"
 
-#include "../fnv_1.h"
-#include "../crc16.h"
-#include "../crc16_ccitt.h"
-#include "../crc32.h"
+#include "../src/fnv_1.h"
+#include "../src/crc16.h"
+#include "../src/crc16_ccitt.h"
+#include "../src/crc32.h"
 
 struct hash1_t
 {

diff --git a/test/test_bsd_checksum.cpp b/test/test_bsd_checksum.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../checksum.h"
+#include "../src/checksum.h"
 
 namespace
 {

diff --git a/test/test_checksum.cpp b/test/test_checksum.cpp
@@ -33,8 +33,8 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../checksum.h"
-#include "../endian.h"
+#include "../src/checksum.h"
+#include "../src/endian.h"
 
 namespace
 {		

diff --git a/test/test_container.cpp b/test/test_container.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../container.h"
+#include "../src/container.h"
 
 #include <list>
 

diff --git a/test/test_crc.cpp b/test/test_crc.cpp
@@ -33,12 +33,12 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../crc8_ccitt.h"
-#include "../crc16.h"
-#include "../crc16_ccitt.h"
-#include "../crc16_kermit.h"
-#include "../crc32.h"
-#include "../crc64_ecma.h"
+#include "../src/crc8_ccitt.h"
+#include "../src/crc16.h"
+#include "../src/crc16_ccitt.h"
+#include "../src/crc16_kermit.h"
+#include "../src/crc32.h"
+#include "../src/crc64_ecma.h"
 
 namespace
 {

diff --git a/test/test_cyclic_value.cpp b/test/test_cyclic_value.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../cyclic_value.h"
+#include "../src/cyclic_value.h"
 
 namespace
 {		

diff --git a/test/test_deque.cpp b/test/test_deque.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include "ExtraCheckMacros.h"
 
-#include "../deque.h"
+#include "../src/deque.h"
 
 #include "data.h"
 

diff --git a/test/test_endian.cpp b/test/test_endian.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../endian.h"
+#include "../src/endian.h"
 
 namespace 
 {		

diff --git a/test/test_enum_type.cpp b/test/test_enum_type.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../enum_type.h"
+#include "../src/enum_type.h"
 
 struct enum_test
 {

diff --git a/test/test_error_handler.cpp b/test/test_error_handler.cpp
@@ -33,8 +33,8 @@ SOFTWARE.
 #include <sstream>
 #include <string>
 
-#include "../error_handler.h"
-#include "../exception.h"
+#include "../src/error_handler.h"
+#include "../src/exception.h"
 
 bool error_received;
 

diff --git a/test/test_exception.cpp b/test/test_exception.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../exception.h"
+#include "../src/exception.h"
 
 namespace 
 {		

diff --git a/test/test_fixed_iterator.cpp b/test/test_fixed_iterator.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 #include <vector>
 #include <ostream>
 
-#include "../fixed_iterator.h"
+#include "../src/fixed_iterator.h"
 
 template <typename TIterator>
 std::ostream& operator << (std::ostream& os, const etl::fixed_iterator<TIterator>& fi)

diff --git a/test/test_flat_map.cpp b/test/test_flat_map.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_map.h"
+#include "../src/flat_map.h"
 
 namespace
 {

diff --git a/test/test_flat_multimap.cpp b/test/test_flat_multimap.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_multimap.h"
+#include "../src/flat_multimap.h"
 
 namespace
 {

diff --git a/test/test_flat_multiset.cpp b/test/test_flat_multiset.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_multiset.h"
+#include "../src/flat_multiset.h"
 
 namespace
 {

diff --git a/test/test_flat_set.cpp b/test/test_flat_set.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_set.h"
+#include "../src/flat_set.h"
 
 namespace
 {

diff --git a/test/test_fnv_1.cpp b/test/test_fnv_1.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../fnv_1.h"
+#include "../src/fnv_1.h"
 
 namespace
 {		

diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../forward_list.h"
+#include "../src/forward_list.h"
 
 #include <algorithm>
 #include <array>

diff --git a/test/test_function.cpp b/test/test_function.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../function.h"
+#include "../src/function.h"
 
 //*****************************************************************************
 const int VALUE = 1;

diff --git a/test/test_functional.cpp b/test/test_functional.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../functional.h"
+#include "../src/functional.h"
 
 #include <list>
 #include <vector>

diff --git a/test/test_hash.cpp b/test/test_hash.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../hash.h"
+#include "../src/hash.h"
 
 namespace
 {

diff --git a/test/test_instance_count.cpp b/test/test_instance_count.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../instance_count.h"
+#include "../src/instance_count.h"
 
 #include <list>
 #include <vector>

diff --git a/test/test_integral_limits.cpp b/test/test_integral_limits.cpp
@@ -32,7 +32,7 @@ SOFTWARE.
 #include <type_traits>
 #include <bitset>
 
-#include "../integral_limits.h"
+#include "../src/integral_limits.h"
 
 #undef min
 #undef max

diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_forward_list.h"
+#include "../src/intrusive_forward_list.h"
 
 #include <algorithm>
 #include <array>

diff --git a/test/test_intrusive_links.cpp b/test/test_intrusive_links.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_links.h"
+#include "../src/intrusive_links.h"
 
 namespace
 {

diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_list.h"
+#include "../src/intrusive_list.h"
 
 #include <algorithm>
 #include <array>

diff --git a/test/test_io_port.cpp b/test/test_io_port.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../io_port.h"
+#include "../src/io_port.h"
 
 #include <stdint.h>
 

diff --git a/test/test_jenkins.cpp b/test/test_jenkins.cpp
@@ -35,8 +35,8 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../jenkins.h"
-#include "../endian.h"
+#include "../src/jenkins.h"
+#include "../src/endian.h"
 
 template <typename TIterator>
 uint32_t jenkins32(TIterator begin, TIterator end)

diff --git a/test/test_largest.cpp b/test/test_largest.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../largest.h"
+#include "../src/largest.h"
 
 #include <type_traits>
 

diff --git a/test/test_list.cpp b/test/test_list.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include "ExtraCheckMacros.h"
 
-#include "../list.h"
+#include "../src/list.h"
 
 #include "data.h"
 

diff --git a/test/test_map.cpp b/test/test_map.cpp
@@ -36,7 +36,7 @@ SOFTWARE.
 #include <string>
 #include <vector>
 
-#include "../map.h"
+#include "../src/map.h"
 
 static const size_t SIZE = 10;