From 31370f855bbb8db4b684c29a776245628a5a42a7 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 20 Dec 2017 20:48:24 +0100 Subject: [PATCH] update includes in str --- alib2str/src/automaton/AutomatonFromStringLexer.cpp | 2 +- alib2str/src/automaton/AutomatonFromStringLexer.h | 4 ++-- .../string/common/AutomatonFromStringParserCommon.h | 2 +- alib2str/src/container/ContainerFromStringLexer.h | 4 ++-- alib2str/src/core/stringApi.hpp | 12 ++++++------ alib2str/src/factory/StringDataFactory.hpp | 2 +- alib2str/src/grammar/GrammarFromStringLexer.h | 4 ++-- .../string/common/GrammarFromStringParserCommon.h | 8 ++++---- alib2str/src/primitive/PrimitiveFromStringLexer.h | 4 ++-- alib2str/src/regexp/RegExpFromStringLexer.h | 4 ++-- alib2str/src/regexp/string/UnboundedRegExp.h | 4 ++-- alib2str/src/registry/StringReaderRegistry.hpp | 6 +++--- alib2str/src/registry/StringWriterRegistry.hpp | 8 ++++---- alib2str/src/string/StringFromStringLexer.h | 4 ++-- .../string/common/StringFromStringParserCommon.h | 2 +- .../string/common/StringToStringComposerCommon.h | 2 +- alib2str/src/tree/TreeFromStringLexer.h | 4 ++-- .../tree/string/common/TreeFromStringParserCommon.h | 2 +- .../tree/string/common/TreeToStringComposerCommon.h | 2 +- alib2str/test-src/grammar/GrammarTest.cpp | 2 +- alib2str/test-src/regexp/RegExpTest.cpp | 2 +- alib2str/test-src/string/StringTest.cpp | 2 +- alib2str/test-src/tree/TreeTest.cpp | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.cpp b/alib2str/src/automaton/AutomatonFromStringLexer.cpp index d14172de4a..2ba51cc9cd 100644 --- a/alib2str/src/automaton/AutomatonFromStringLexer.cpp +++ b/alib2str/src/automaton/AutomatonFromStringLexer.cpp @@ -7,7 +7,7 @@ #include "AutomatonFromStringLexer.h" #include <exception/CommonException.h> -#include <iterator> +#include <alib/iterator> namespace automaton { diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.h b/alib2str/src/automaton/AutomatonFromStringLexer.h index 077480a67a..b921e11476 100644 --- a/alib2str/src/automaton/AutomatonFromStringLexer.h +++ b/alib2str/src/automaton/AutomatonFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef AUTOMATON_FROM_STRING_LEXER_H_ #define AUTOMATON_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace automaton { diff --git a/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h b/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h index 2afeaa5f07..a097f5f13c 100644 --- a/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h +++ b/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h @@ -8,7 +8,7 @@ #ifndef AUTOMATON_FROM_STRING_PARSER_COMMON_H_ #define AUTOMATON_FROM_STRING_PARSER_COMMON_H_ -#include <istream> +#include <alib/istream> namespace automaton { diff --git a/alib2str/src/container/ContainerFromStringLexer.h b/alib2str/src/container/ContainerFromStringLexer.h index 69d18a53d5..cdd29a8d4e 100644 --- a/alib2str/src/container/ContainerFromStringLexer.h +++ b/alib2str/src/container/ContainerFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef _CONTAINER_FROM_STRING_LEXER_H_ #define _CONTAINER_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace container { diff --git a/alib2str/src/core/stringApi.hpp b/alib2str/src/core/stringApi.hpp index 9a242d1808..935544b01b 100644 --- a/alib2str/src/core/stringApi.hpp +++ b/alib2str/src/core/stringApi.hpp @@ -8,12 +8,12 @@ #ifndef STRING_API_HPP_ #define STRING_API_HPP_ -#include <functional> -#include <deque> -#include <map> -#include <string> -#include <memory> -#include <algorithm> +#include <alib/functional> +#include <alib/deque> +#include <alib/map> +#include <alib/string> +#include <alib/memory> +#include <alib/algorithm> #include "base/WrapperBase.hpp" diff --git a/alib2str/src/factory/StringDataFactory.hpp b/alib2str/src/factory/StringDataFactory.hpp index e5126e8fcb..21109c552b 100644 --- a/alib2str/src/factory/StringDataFactory.hpp +++ b/alib2str/src/factory/StringDataFactory.hpp @@ -8,7 +8,7 @@ #ifndef STRING_DATA_FACTORY #define STRING_DATA_FACTORY -#include <set> +#include <alib/set> #include "exception/CommonException.h" #include <core/stringApi.hpp> #include <fstream> diff --git a/alib2str/src/grammar/GrammarFromStringLexer.h b/alib2str/src/grammar/GrammarFromStringLexer.h index 209688895c..3535509b03 100644 --- a/alib2str/src/grammar/GrammarFromStringLexer.h +++ b/alib2str/src/grammar/GrammarFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef GRAMMAR_FROM_STRING_LEXER_H_ #define GRAMMAR_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace grammar { diff --git a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h index fadc0303f7..45131d8c84 100644 --- a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h +++ b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h @@ -8,10 +8,10 @@ #ifndef _GRAMMAR_FROM_STRING_PARSER_COMMON_H_ #define _GRAMMAR_FROM_STRING_PARSER_COMMON_H_ -#include <set> -#include <vector> -#include <map> -#include <tuple> +#include <alib/set> +#include <alib/vector> +#include <alib/map> +#include <alib/tuple> #include <exception/CommonException.h> diff --git a/alib2str/src/primitive/PrimitiveFromStringLexer.h b/alib2str/src/primitive/PrimitiveFromStringLexer.h index 946dc0668d..cb9d25da51 100644 --- a/alib2str/src/primitive/PrimitiveFromStringLexer.h +++ b/alib2str/src/primitive/PrimitiveFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef PRIMITIVE_FROM_STRING_LEXER_H_ #define PRIMITIVE_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace primitive { diff --git a/alib2str/src/regexp/RegExpFromStringLexer.h b/alib2str/src/regexp/RegExpFromStringLexer.h index 40911243c5..6f23d3772a 100644 --- a/alib2str/src/regexp/RegExpFromStringLexer.h +++ b/alib2str/src/regexp/RegExpFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef REG_EXP_FROM_STRING_LEXER_H_ #define REG_EXP_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace regexp { diff --git a/alib2str/src/regexp/string/UnboundedRegExp.h b/alib2str/src/regexp/string/UnboundedRegExp.h index 082ba308f0..475177541b 100644 --- a/alib2str/src/regexp/string/UnboundedRegExp.h +++ b/alib2str/src/regexp/string/UnboundedRegExp.h @@ -8,8 +8,8 @@ #ifndef _STRING_UNBOUNDED_REG_EXP_H_ #define _STRING_UNBOUNDED_REG_EXP_H_ -#include <memory> -#include <utility> +#include <alib/memory> +#include <alib/utility> #include <regexp/unbounded/UnboundedRegExpStructure.h> #include <regexp/unbounded/UnboundedRegExp.h> diff --git a/alib2str/src/registry/StringReaderRegistry.hpp b/alib2str/src/registry/StringReaderRegistry.hpp index 722c5f96bc..de12a0cd32 100644 --- a/alib2str/src/registry/StringReaderRegistry.hpp +++ b/alib2str/src/registry/StringReaderRegistry.hpp @@ -8,9 +8,9 @@ #ifndef _STRING_READER_REGISTRY_HPP_ #define _STRING_READER_REGISTRY_HPP_ -#include <memory> -#include <string> -#include <map> +#include <alib/memory> +#include <alib/string> +#include <alib/map> #include <exception/CommonException.h> #include <abstraction/OperationAbstraction.hpp> diff --git a/alib2str/src/registry/StringWriterRegistry.hpp b/alib2str/src/registry/StringWriterRegistry.hpp index 1cc8e98cd5..376cc96f95 100644 --- a/alib2str/src/registry/StringWriterRegistry.hpp +++ b/alib2str/src/registry/StringWriterRegistry.hpp @@ -8,10 +8,10 @@ #ifndef _STRING_WRITER_REGISTRY_HPP_ #define _STRING_WRITER_REGISTRY_HPP_ -#include <memory> -#include <string> -#include <set> -#include <map> +#include <alib/memory> +#include <alib/string> +#include <alib/set> +#include <alib/map> #include <exception/CommonException.h> #include <abstraction/OperationAbstraction.hpp> diff --git a/alib2str/src/string/StringFromStringLexer.h b/alib2str/src/string/StringFromStringLexer.h index 96f6e3d4d4..03af658f37 100644 --- a/alib2str/src/string/StringFromStringLexer.h +++ b/alib2str/src/string/StringFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef STRING_FROM_STRING_LEXER_H_ #define STRING_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace string { diff --git a/alib2str/src/string/string/common/StringFromStringParserCommon.h b/alib2str/src/string/string/common/StringFromStringParserCommon.h index 24e78302b4..112f185473 100644 --- a/alib2str/src/string/string/common/StringFromStringParserCommon.h +++ b/alib2str/src/string/string/common/StringFromStringParserCommon.h @@ -8,7 +8,7 @@ #ifndef _STRING_FROM_STRING_PARSER_COMMON_H_ #define _STRING_FROM_STRING_PARSER_COMMON_H_ -#include <vector> +#include <alib/vector> #include <core/stringApi.hpp> diff --git a/alib2str/src/string/string/common/StringToStringComposerCommon.h b/alib2str/src/string/string/common/StringToStringComposerCommon.h index 5ebbd7ae33..4f113ac82e 100644 --- a/alib2str/src/string/string/common/StringToStringComposerCommon.h +++ b/alib2str/src/string/string/common/StringToStringComposerCommon.h @@ -9,7 +9,7 @@ #define STRING_TO_STRING_COMPOSER_COMMON_H_ #include <ostream> -#include <vector> +#include <alib/vector> #include <core/stringApi.hpp> diff --git a/alib2str/src/tree/TreeFromStringLexer.h b/alib2str/src/tree/TreeFromStringLexer.h index c3ef262aa5..b8cf904b0e 100644 --- a/alib2str/src/tree/TreeFromStringLexer.h +++ b/alib2str/src/tree/TreeFromStringLexer.h @@ -8,8 +8,8 @@ #ifndef TREE_FROM_STRING_LEXER_H_ #define TREE_FROM_STRING_LEXER_H_ -#include <string> -#include <istream> +#include <alib/string> +#include <alib/istream> namespace tree { diff --git a/alib2str/src/tree/string/common/TreeFromStringParserCommon.h b/alib2str/src/tree/string/common/TreeFromStringParserCommon.h index 1c5e82d790..2427768944 100644 --- a/alib2str/src/tree/string/common/TreeFromStringParserCommon.h +++ b/alib2str/src/tree/string/common/TreeFromStringParserCommon.h @@ -8,7 +8,7 @@ #ifndef _TREE_FROM_STRING_PARSER_COMMON_H_ #define _TREE_FROM_STRING_PARSER_COMMON_H_ -#include <vector> +#include <alib/vector> #include <core/stringApi.hpp> diff --git a/alib2str/src/tree/string/common/TreeToStringComposerCommon.h b/alib2str/src/tree/string/common/TreeToStringComposerCommon.h index 122a420fe8..89d743e8fb 100644 --- a/alib2str/src/tree/string/common/TreeToStringComposerCommon.h +++ b/alib2str/src/tree/string/common/TreeToStringComposerCommon.h @@ -9,7 +9,7 @@ #define _TREE_TO_STRING_COMPOSER_COMMON_H_ #include <ostream> -#include <vector> +#include <alib/vector> #include <core/stringApi.hpp> diff --git a/alib2str/test-src/grammar/GrammarTest.cpp b/alib2str/test-src/grammar/GrammarTest.cpp index 198fe871f6..41cb94e902 100644 --- a/alib2str/test-src/grammar/GrammarTest.cpp +++ b/alib2str/test-src/grammar/GrammarTest.cpp @@ -1,4 +1,4 @@ -#include <list> +#include <alib/list> #include "GrammarTest.h" #include "sax/SaxParseInterface.h" diff --git a/alib2str/test-src/regexp/RegExpTest.cpp b/alib2str/test-src/regexp/RegExpTest.cpp index 97b2e931e0..391b13176b 100644 --- a/alib2str/test-src/regexp/RegExpTest.cpp +++ b/alib2str/test-src/regexp/RegExpTest.cpp @@ -1,4 +1,4 @@ -#include <list> +#include <alib/list> #include "RegExpTest.h" #include "sax/SaxParseInterface.h" diff --git a/alib2str/test-src/string/StringTest.cpp b/alib2str/test-src/string/StringTest.cpp index 8a77711b15..1ce818feb2 100644 --- a/alib2str/test-src/string/StringTest.cpp +++ b/alib2str/test-src/string/StringTest.cpp @@ -1,4 +1,4 @@ -#include <list> +#include <alib/list> #include "StringTest.h" #include "sax/SaxParseInterface.h" diff --git a/alib2str/test-src/tree/TreeTest.cpp b/alib2str/test-src/tree/TreeTest.cpp index c67bd5cb6d..d927cfc35f 100644 --- a/alib2str/test-src/tree/TreeTest.cpp +++ b/alib2str/test-src/tree/TreeTest.cpp @@ -1,4 +1,4 @@ -#include <list> +#include <alib/list> #include "TreeTest.h" #include "sax/SaxParseInterface.h" -- GitLab