From d86f714fc1da41976b1032f8c067a1dfcaab291a Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 20 Dec 2017 20:46:02 +0100 Subject: [PATCH] update includes in common --- alib2common/src/base/CommonBase.hpp | 4 ++-- alib2common/src/base/WrapperBase.hpp | 2 +- alib2common/src/common/createUnique.hpp | 6 +++--- alib2common/src/container/ObjectsDeque.h | 4 ++-- alib2common/src/container/ObjectsList.h | 4 ++-- alib2common/src/container/ObjectsMap.h | 4 ++-- alib2common/src/container/ObjectsPair.h | 4 ++-- alib2common/src/container/ObjectsSet.h | 4 ++-- alib2common/src/container/ObjectsTree.h | 4 ++-- alib2common/src/container/ObjectsTrie.h | 4 ++-- alib2common/src/container/ObjectsVector.h | 4 ++-- alib2common/src/core/components.hpp | 2 +- alib2common/src/core/components/setComponents.hpp | 4 ++-- alib2common/src/core/visitor.hpp | 2 +- alib2common/src/debug/sigHandler.cpp | 2 +- alib2common/src/debug/sigHandler.h | 2 +- alib2common/src/debug/simpleStacktrace.cpp | 4 ++-- alib2common/src/debug/simpleStacktrace.h | 2 +- alib2common/src/exception/CommonException.h | 2 +- alib2common/src/global/GlobalData.cpp | 4 ++-- alib2common/src/global/GlobalData.h | 4 ++-- alib2common/src/object/ObjectBase.h | 2 +- alib2common/src/primitive/String.h | 2 +- alib2common/test-src/container/ContainerTest.cpp | 2 +- alib2common/test-src/core/ComponentsTest.cpp | 4 ++-- alib2common/test-src/object/ObjectTest.cpp | 4 ++-- 26 files changed, 43 insertions(+), 43 deletions(-) diff --git a/alib2common/src/base/CommonBase.hpp b/alib2common/src/base/CommonBase.hpp index d7e878e741..856f0af9bb 100644 --- a/alib2common/src/base/CommonBase.hpp +++ b/alib2common/src/base/CommonBase.hpp @@ -8,8 +8,8 @@ #ifndef COMMON_BASE_H_ #define COMMON_BASE_H_ -#include <typeinfo> -#include <typeindex> +#include <alib/typeinfo> +#include <alib/typeindex> #include <ostream> #include <stdexcept> diff --git a/alib2common/src/base/WrapperBase.hpp b/alib2common/src/base/WrapperBase.hpp index c056cc2db1..a86d36dbbe 100644 --- a/alib2common/src/base/WrapperBase.hpp +++ b/alib2common/src/base/WrapperBase.hpp @@ -9,7 +9,7 @@ #define WRAPPER_BASE_H_ #include <ostream> -#include <memory> +#include <alib/memory> namespace alib { diff --git a/alib2common/src/common/createUnique.hpp b/alib2common/src/common/createUnique.hpp index aede9466c7..fac85d8c7e 100644 --- a/alib2common/src/common/createUnique.hpp +++ b/alib2common/src/common/createUnique.hpp @@ -8,11 +8,11 @@ #ifndef CREATE_UNIQUE_H_ #define CREATE_UNIQUE_H_ -#include <type_traits> -#include <set> +#include <alib/type_traits> +#include <alib/set> #include "exception/CommonException.h" #include <climits> -#include <algorithm> +#include <alib/algorithm> namespace common { diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h index 86142b77a1..e1716b5b17 100644 --- a/alib2common/src/container/ObjectsDeque.h +++ b/alib2common/src/container/ObjectsDeque.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_DEQUE_H_ #define OBJECTS_DEQUE_H_ -#include <deque> -#include <string> +#include <alib/deque> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h index 1c1646ffc9..8a09d6aca5 100644 --- a/alib2common/src/container/ObjectsList.h +++ b/alib2common/src/container/ObjectsList.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_LIST_H_ #define OBJECTS_LIST_H_ -#include <list> -#include <string> +#include <alib/list> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h index 7ecf0540d2..bc86ece612 100644 --- a/alib2common/src/container/ObjectsMap.h +++ b/alib2common/src/container/ObjectsMap.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_MAP_H_ #define OBJECTS_MAP_H_ -#include <map> -#include <string> +#include <alib/map> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h index d35d354aa3..054ad78d2d 100644 --- a/alib2common/src/container/ObjectsPair.h +++ b/alib2common/src/container/ObjectsPair.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_PAIR_H_ #define OBJECTS_PAIR_H_ -#include <pair> -#include <string> +#include <alib/pair> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h index 1fc34c166a..512c308cff 100644 --- a/alib2common/src/container/ObjectsSet.h +++ b/alib2common/src/container/ObjectsSet.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_SET_H_ #define OBJECTS_SET_H_ -#include <set> -#include <string> +#include <alib/set> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h index c88821d4bb..0211a8ff4a 100644 --- a/alib2common/src/container/ObjectsTree.h +++ b/alib2common/src/container/ObjectsTree.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_TREE_H_ #define OBJECTS_TREE_H_ -#include <tree> -#include <string> +#include <alib/tree> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsTrie.h b/alib2common/src/container/ObjectsTrie.h index 515894b3bb..4fcaf6836d 100644 --- a/alib2common/src/container/ObjectsTrie.h +++ b/alib2common/src/container/ObjectsTrie.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_TRIE_H_ #define OBJECTS_TRIE_H_ -#include <trie> -#include <string> +#include <alib/trie> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h index 15c0537f0e..c9804f762a 100644 --- a/alib2common/src/container/ObjectsVector.h +++ b/alib2common/src/container/ObjectsVector.h @@ -8,8 +8,8 @@ #ifndef OBJECTS_VECTOR_H_ #define OBJECTS_VECTOR_H_ -#include <vector> -#include <string> +#include <alib/vector> +#include <alib/string> #include <sstream> #include "ContainerBase.h" diff --git a/alib2common/src/core/components.hpp b/alib2common/src/core/components.hpp index a5b919d3d7..0fa2029c8d 100644 --- a/alib2common/src/core/components.hpp +++ b/alib2common/src/core/components.hpp @@ -8,7 +8,7 @@ #ifndef _COMPONENTS_HPP_ #define _COMPONENTS_HPP_ -#include <typeinfo> +#include <alib/typeinfo> #include <exception/CommonException.h> #include <registry/AlgorithmRegistry.hpp> diff --git a/alib2common/src/core/components/setComponents.hpp b/alib2common/src/core/components/setComponents.hpp index 5ad62ccf67..5b540a92d7 100644 --- a/alib2common/src/core/components/setComponents.hpp +++ b/alib2common/src/core/components/setComponents.hpp @@ -8,8 +8,8 @@ #ifndef _SET_COMPONENT_HPP_ #define _SET_COMPONENT_HPP_ -#include <algorithm> -#include <typeinfo> +#include <alib/algorithm> +#include <alib/typeinfo> #include <exception/CommonException.h> #include <registry/AlgorithmRegistry.hpp> diff --git a/alib2common/src/core/visitor.hpp b/alib2common/src/core/visitor.hpp index 62accfff55..f928ba61fb 100644 --- a/alib2common/src/core/visitor.hpp +++ b/alib2common/src/core/visitor.hpp @@ -8,7 +8,7 @@ #ifndef VISITOR_HPP_ #define VISITOR_HPP_ -#include <utility> +#include <alib/utility> namespace alib { diff --git a/alib2common/src/debug/sigHandler.cpp b/alib2common/src/debug/sigHandler.cpp index e7a791c314..7ba1605402 100644 --- a/alib2common/src/debug/sigHandler.cpp +++ b/alib2common/src/debug/sigHandler.cpp @@ -7,7 +7,7 @@ #include "sigHandler.h" #include "simpleStacktrace.h" -#include <iostream> +#include <alib/iostream> #include <global/GlobalData.h> namespace ext { diff --git a/alib2common/src/debug/sigHandler.h b/alib2common/src/debug/sigHandler.h index 0d304c3afc..50fbfccf72 100644 --- a/alib2common/src/debug/sigHandler.h +++ b/alib2common/src/debug/sigHandler.h @@ -1,7 +1,7 @@ #ifndef SIG_HANDLER_H_ #define SIG_HANDLER_H_ -#include <string> +#include <alib/string> namespace ext { diff --git a/alib2common/src/debug/simpleStacktrace.cpp b/alib2common/src/debug/simpleStacktrace.cpp index 4d1775f416..9dc06a2150 100644 --- a/alib2common/src/debug/simpleStacktrace.cpp +++ b/alib2common/src/debug/simpleStacktrace.cpp @@ -12,8 +12,8 @@ #include <cstring> #include <sstream> -#include <string> -#include <map> +#include <alib/string> +#include <alib/map> namespace ext { diff --git a/alib2common/src/debug/simpleStacktrace.h b/alib2common/src/debug/simpleStacktrace.h index 4c5ffaf396..695600d453 100644 --- a/alib2common/src/debug/simpleStacktrace.h +++ b/alib2common/src/debug/simpleStacktrace.h @@ -4,7 +4,7 @@ #ifndef _SIMPLE_STACKTRACE_H_ #define _SIMPLE_STACKTRACE_H_ -#include <string> +#include <alib/string> namespace ext { diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h index cb827b20b4..008d3d9591 100644 --- a/alib2common/src/exception/CommonException.h +++ b/alib2common/src/exception/CommonException.h @@ -9,7 +9,7 @@ #define COMMON_EXCEPTION_H_ #include <exception> -#include <string> +#include <alib/string> #include <ostream> #include "../object/ObjectBase.h" diff --git a/alib2common/src/global/GlobalData.cpp b/alib2common/src/global/GlobalData.cpp index 2c9d72971f..d718b0e344 100644 --- a/alib2common/src/global/GlobalData.cpp +++ b/alib2common/src/global/GlobalData.cpp @@ -8,8 +8,8 @@ #include "GlobalData.h" #include <cstdlib> -#include <iostream> -#include <string> +#include <alib/iostream> +#include <alib/string> namespace common { diff --git a/alib2common/src/global/GlobalData.h b/alib2common/src/global/GlobalData.h index 6e81223596..2b5b9f8867 100644 --- a/alib2common/src/global/GlobalData.h +++ b/alib2common/src/global/GlobalData.h @@ -8,8 +8,8 @@ #ifndef _GLOBAL_DATA_H_ #define _GLOBAL_DATA_H_ -#include <functional> -#include <istream> +#include <alib/functional> +#include <alib/istream> #include <ostream> namespace common { diff --git a/alib2common/src/object/ObjectBase.h b/alib2common/src/object/ObjectBase.h index 94d49656bc..7a92f0ff3a 100644 --- a/alib2common/src/object/ObjectBase.h +++ b/alib2common/src/object/ObjectBase.h @@ -8,7 +8,7 @@ #ifndef OBJECT_BASE_H_ #define OBJECT_BASE_H_ -#include <memory> +#include <alib/memory> #include "../base/CommonBase.hpp" namespace alib { diff --git a/alib2common/src/primitive/String.h b/alib2common/src/primitive/String.h index 4bcead0a5c..47606b87ce 100644 --- a/alib2common/src/primitive/String.h +++ b/alib2common/src/primitive/String.h @@ -9,7 +9,7 @@ #define PRIMITIVE_STRING_H_ #include "PrimitiveBase.h" -#include <string> +#include <alib/string> namespace primitive { diff --git a/alib2common/test-src/container/ContainerTest.cpp b/alib2common/test-src/container/ContainerTest.cpp index 6c1720fd17..ff9f665565 100644 --- a/alib2common/test-src/container/ContainerTest.cpp +++ b/alib2common/test-src/container/ContainerTest.cpp @@ -4,7 +4,7 @@ #include "container/ObjectsSet.h" #include "container/ObjectsDeque.h" -#include <type_traits> +#include <alib/type_traits> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ContainerTest, "container" ); CPPUNIT_TEST_SUITE_REGISTRATION ( ContainerTest ); diff --git a/alib2common/test-src/core/ComponentsTest.cpp b/alib2common/test-src/core/ComponentsTest.cpp index 65b7c91ce8..af67abb5ff 100644 --- a/alib2common/test-src/core/ComponentsTest.cpp +++ b/alib2common/test-src/core/ComponentsTest.cpp @@ -1,8 +1,8 @@ #include "ComponentsTest.h" #include <core/components.hpp> -#include <set> -#include <linear_set> +#include <alib/set> +#include <alib/linear_set> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ComponentsTest, "alphabet" ); CPPUNIT_TEST_SUITE_REGISTRATION ( ComponentsTest ); diff --git a/alib2common/test-src/object/ObjectTest.cpp b/alib2common/test-src/object/ObjectTest.cpp index adb4e7f26c..45987d2a3b 100644 --- a/alib2common/test-src/object/ObjectTest.cpp +++ b/alib2common/test-src/object/ObjectTest.cpp @@ -1,10 +1,10 @@ -#include <list> +#include <alib/list> #include "ObjectTest.h" #include "object/Object.h" #include <primitive/Unsigned.h> -#include <type_traits> +#include <alib/type_traits> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ObjectTest, "object" ); CPPUNIT_TEST_SUITE_REGISTRATION ( ObjectTest ); -- GitLab