From bef6829613e34540231a898b9c9e4a4703c01832 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 17 Apr 2017 13:35:12 +0100 Subject: [PATCH] Changes due to removal of ivector.h --- src/intrusive_flat_map.h | 1 - src/intrusive_flat_multimap.h | 2 -- src/intrusive_flat_multiset.h | 3 +-- src/intrusive_flat_set.h | 3 +-- src/iunordered_map.h | 4 ++-- src/iunordered_multimap.h | 4 ++-- src/iunordered_multiset.h | 4 ++-- src/iunordered_set.h | 4 ++-- 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/intrusive_flat_map.h b/src/intrusive_flat_map.h index 2de66ac3..5df4ffb2 100644 --- a/src/intrusive_flat_map.h +++ b/src/intrusive_flat_map.h @@ -35,7 +35,6 @@ SOFTWARE. #include "exception.h" #include "vector.h" -#include "ivector.h" #include "error_handler.h" #undef ETL_FILE diff --git a/src/intrusive_flat_multimap.h b/src/intrusive_flat_multimap.h index 1b6be516..8cdcea20 100644 --- a/src/intrusive_flat_multimap.h +++ b/src/intrusive_flat_multimap.h @@ -34,11 +34,9 @@ SOFTWARE. #include #include "exception.h" -#include "ivector.h" #include "error_handler.h" #include "debug_count.h" #include "vector.h" -#include "ivector.h" #undef ETL_FILE #define ETL_FILE "31" diff --git a/src/intrusive_flat_multiset.h b/src/intrusive_flat_multiset.h index af50ad61..0bef8e47 100644 --- a/src/intrusive_flat_multiset.h +++ b/src/intrusive_flat_multiset.h @@ -39,9 +39,8 @@ SOFTWARE. #include "platform.h" #include "type_traits.h" -#include "ivector.h" #include "vector.h" -#include "ipool.h" +#include "pool.h" #include "error_handler.h" #include "exception.h" diff --git a/src/intrusive_flat_set.h b/src/intrusive_flat_set.h index 28c46962..3b57d567 100644 --- a/src/intrusive_flat_set.h +++ b/src/intrusive_flat_set.h @@ -39,11 +39,10 @@ SOFTWARE. #include "platform.h" #include "type_traits.h" -#include "ipool.h" +#include "pool.h" #include "error_handler.h" #include "exception.h" #include "vector.h" -#include "ivector.h" #undef ETL_FILE #define ETL_FILE "32" diff --git a/src/iunordered_map.h b/src/iunordered_map.h index 22127922..b8ca29e3 100644 --- a/src/iunordered_map.h +++ b/src/iunordered_map.h @@ -42,8 +42,8 @@ SOFTWARE. #include "parameter_type.h" #include "hash.h" #include "nullptr.h" -#include "ipool.h" -#include "ivector.h" +#include "pool.h" +#include "vector.h" #include "error_handler.h" #include "intrusive_forward_list.h" #include "exception.h" diff --git a/src/iunordered_multimap.h b/src/iunordered_multimap.h index 7319a624..52be139e 100644 --- a/src/iunordered_multimap.h +++ b/src/iunordered_multimap.h @@ -42,8 +42,8 @@ SOFTWARE. #include "parameter_type.h" #include "hash.h" #include "nullptr.h" -#include "ipool.h" -#include "ivector.h" +#include "pool.h" +#include "vector.h" #include "error_handler.h" #include "intrusive_forward_list.h" #include "exception.h" diff --git a/src/iunordered_multiset.h b/src/iunordered_multiset.h index f1966559..4270b337 100644 --- a/src/iunordered_multiset.h +++ b/src/iunordered_multiset.h @@ -42,8 +42,8 @@ SOFTWARE. #include "parameter_type.h" #include "hash.h" #include "nullptr.h" -#include "ipool.h" -#include "ivector.h" +#include "pool.h" +#include "vector.h" #include "error_handler.h" #include "intrusive_forward_list.h" #include "exception.h" diff --git a/src/iunordered_set.h b/src/iunordered_set.h index 789375bb..a4ef7391 100644 --- a/src/iunordered_set.h +++ b/src/iunordered_set.h @@ -42,8 +42,8 @@ SOFTWARE. #include "parameter_type.h" #include "hash.h" #include "nullptr.h" -#include "ipool.h" -#include "ivector.h" +#include "pool.h" +#include "vector.h" #include "error_handler.h" #include "intrusive_forward_list.h" #include "exception.h"