move Types.hpp and IODefinitions.hpp to root folder

changelog/1.4.0.md

@@ -62,6 +62,8 @@ OATPP_ASSERT(decoded == data)
 | `oatpp/core/utils/ConversionUtils.hpp` | `oatpp/utils/Conversion.hpp` |
 | `oatpp/core/macro/*`                   | `oatpp/macro/*`              |
 | `oatpp/core/async/*`                   | `oatpp/async/*`              |
+| `oatpp/core/Types.hpp`                 | `oatpp/Types.hpp`            |
+| `oatpp/core/IODefinitions.hpp`         | `oatpp/IODefinitions.hpp`    |
 
 ### Namespaces
 

src/CMakeLists.txt

@@ -49,9 +49,6 @@ add_library(oatpp
 		oatpp/codegen/DbClient_undef.hpp
 		oatpp/codegen/DTO_define.hpp
 		oatpp/codegen/DTO_undef.hpp
-        oatpp/core/IODefinitions.cpp
-        oatpp/core/IODefinitions.hpp
-        oatpp/core/Types.hpp
         oatpp/core/base/CommandLineArguments.cpp
         oatpp/core/base/CommandLineArguments.hpp
         oatpp/core/base/Config.hpp
@@ -294,6 +291,9 @@ add_library(oatpp
         oatpp/web/url/mapping/Pattern.cpp
         oatpp/web/url/mapping/Pattern.hpp
         oatpp/web/url/mapping/Router.hpp
+		oatpp/IODefinitions.cpp
+		oatpp/IODefinitions.hpp
+		oatpp/Types.hpp
 )
 set_target_source_groups(oatpp STRIP_PREFIX "oatpp")
 

src/oatpp/IODefinitions.hpp

@@ -26,7 +26,7 @@
 #define oatpp_IODefinitions_hpp
 
 #include "oatpp/async/Error.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #if !defined(WIN32) && !defined(_WIN32)
 #include <sys/socket.h>

src/oatpp/async/Coroutine.hpp

@@ -30,10 +30,10 @@
 
 #include "oatpp/async/utils/FastQueue.hpp"
 
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/IODefinitions.hpp"
 #include "oatpp/core/base/Environment.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <chrono>
 #include <exception>

src/oatpp/core/data/Bundle.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_data_Bundle_hpp
 #define oatpp_data_Bundle_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace data {
 

src/oatpp/core/data/buffer/FIFOBuffer.hpp

@@ -26,7 +26,7 @@
 #define oatpp_data_buffer_FIFOBuffer_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/IODefinitions.hpp"
 #include "oatpp/async/Coroutine.hpp"
 #include "oatpp/core/concurrency/SpinLock.hpp"
 

src/oatpp/core/data/buffer/Processor.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_data_buffer_Processor_hpp
 #define oatpp_data_buffer_Processor_hpp
 
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/IODefinitions.hpp"
 #include "oatpp/core/base/ObjectHandle.hpp"
 #include <vector>
 

src/oatpp/core/data/resource/TemporaryFile.hpp

@@ -26,7 +26,7 @@
 #define oatpp_data_resource_TemporaryFile_hpp
 
 #include "./Resource.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace data { namespace resource {
 

src/oatpp/core/data/share/StringTemplate.hpp

@@ -26,7 +26,7 @@
 #define oatpp_data_share_StringTemplate_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <unordered_map>
 #include <vector>

src/oatpp/core/data/stream/Stream.hpp

@@ -30,7 +30,7 @@
 #include "oatpp/core/data/buffer/IOBuffer.hpp"
 #include "oatpp/core/data/buffer/Processor.hpp"
 
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/IODefinitions.hpp"
 
 namespace oatpp { namespace data{ namespace stream {
 

src/oatpp/core/parser/Caret.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_parser_Caret_hpp
 #define oatpp_parser_Caret_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace parser {
 

src/oatpp/core/parser/ParsingError.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_parser_ParsingError_hpp
 #define oatpp_parser_ParsingError_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace parser {
 

src/oatpp/encoding/Base64.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_encoding_Base64_hpp
 #define oatpp_encoding_Base64_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace encoding {
 

src/oatpp/encoding/Hex.hpp

@@ -26,7 +26,7 @@
 #define oatpp_encoding_Hex_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace encoding {
 

src/oatpp/json/Deserializer.hpp

@@ -27,7 +27,7 @@
 
 #include "./Utils.hpp"
 #include "oatpp/core/parser/Caret.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <vector>
 

src/oatpp/json/Serializer.hpp

@@ -27,7 +27,7 @@
 
 #include "./Utils.hpp"
 #include "./Beautifier.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 #include <vector>
 
 namespace oatpp { namespace json {

src/oatpp/json/Utils.hpp

@@ -26,7 +26,7 @@
 #define oatpp_json_Utils_hpp
 
 #include "oatpp/core/parser/Caret.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <string>
 

src/oatpp/network/Address.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_network_Address_hpp
 #define oatpp_network_Address_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace network {
 

src/oatpp/network/Server.hpp

@@ -28,7 +28,7 @@
 #include "oatpp/network/ConnectionHandler.hpp"
 #include "oatpp/network/ConnectionProvider.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include "oatpp/core/base/Countable.hpp"
 #include "oatpp/core/base/Environment.hpp"

src/oatpp/network/Url.hpp

@@ -27,7 +27,7 @@
 
 #include "oatpp/core/data/share/LazyStringMap.hpp"
 #include "oatpp/core/parser/Caret.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace network {
 

src/oatpp/network/monitor/StatCollector.hpp

@@ -25,8 +25,8 @@
 #ifndef oatpp_network_monitor_StatCollector_hpp
 #define oatpp_network_monitor_StatCollector_hpp
 
-#include "oatpp/core/Types.hpp"
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/Types.hpp"
+#include "oatpp/IODefinitions.hpp"
 
 namespace oatpp { namespace network { namespace monitor {
 

src/oatpp/network/tcp/ConnectionConfigurer.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_network_tcp_ConnectionConfigurer_hpp
 #define oatpp_network_tcp_ConnectionConfigurer_hpp
 
-#include <oatpp/core/IODefinitions.hpp>
+#include <oatpp/IODefinitions.hpp>
 
 namespace oatpp { namespace network { namespace tcp {
 

src/oatpp/network/tcp/client/ConnectionProvider.hpp

@@ -29,7 +29,7 @@
 
 #include "oatpp/network/ConnectionProvider.hpp"
 #include "oatpp/core/provider/Invalidator.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace network { namespace tcp { namespace client {
 

src/oatpp/network/tcp/server/ConnectionProvider.hpp

@@ -30,7 +30,7 @@
 #include "oatpp/network/tcp/Connection.hpp"
 #include "oatpp/network/tcp/ConnectionConfigurer.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace network { namespace tcp { namespace server {
 

src/oatpp/orm/DbClient.hpp

@@ -29,7 +29,7 @@
 #include "Transaction.hpp"
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/QueryResult.hpp

@@ -27,7 +27,7 @@
 
 #include "Connection.hpp"
 #include "oatpp/core/provider/Provider.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/utils/Conversion.hpp

@@ -26,7 +26,7 @@
 #define oatpp_utils_Conversion_hpp
 
 #include "oatpp/core/data/mapping/type/Primitive.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 
 #include "oatpp/core/base/Countable.hpp"

src/oatpp/utils/Random.hpp

@@ -26,7 +26,7 @@
 #define oatpp_utils_Random_hpp
 
 #include "oatpp/core/concurrency/SpinLock.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 #include <random>
 
 namespace oatpp { namespace utils { namespace random {

src/oatpp/web/client/ApiClient.hpp

@@ -34,7 +34,7 @@
 
 #include "oatpp/core/data/share/StringTemplate.hpp"
 #include "oatpp/core/data/mapping/ObjectMapper.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include "oatpp/utils/Conversion.hpp"
 

src/oatpp/web/client/RetryPolicy.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_web_client_RetryPolicy_hpp
 #define oatpp_web_client_RetryPolicy_hpp
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <unordered_set>
 

src/oatpp/web/mime/multipart/StatefulParser.hpp

@@ -27,7 +27,7 @@
 
 #include "oatpp/core/data/stream/BufferStream.hpp"
 #include "oatpp/core/data/share/LazyStringMap.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <unordered_map>
 

src/oatpp/web/protocol/CommunicationError.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_web_protocol_CommunicationError_hpp
 #define oatpp_web_protocol_CommunicationError_hpp
 
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/IODefinitions.hpp"
 
 namespace oatpp { namespace web { namespace protocol {
 

src/oatpp/web/protocol/http/Http.hpp

@@ -31,7 +31,7 @@
 
 #include "oatpp/core/parser/Caret.hpp"
 #include "oatpp/core/data/share/LazyStringMap.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <unordered_map>
 #include <unordered_set>

src/oatpp/web/protocol/http/encoding/EncoderProvider.hpp

@@ -26,7 +26,7 @@
 #define oatpp_web_protocol_http_encoding_EncoderProvider_hpp
 
 #include "oatpp/core/data/buffer/Processor.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace encoding {
 

src/oatpp/web/url/mapping/Router.hpp

@@ -27,7 +27,7 @@
 
 #include "./Pattern.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <utility>
 #include <list>

test/oatpp/AllTestsMain.cpp

@@ -62,7 +62,7 @@
 #include "oatpp/core/base/LoggerTest.hpp"
 
 #include "oatpp/async/Coroutine.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include "oatpp/core/base/Environment.hpp"
 

test/oatpp/core/data/mapping/TypeResolverTest.cpp

@@ -25,7 +25,7 @@
 #include "TypeResolverTest.hpp"
 
 #include "oatpp/core/data/mapping/TypeResolver.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 #include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping {

test/oatpp/core/data/mapping/type/EnumTest.cpp

@@ -24,7 +24,7 @@
 
 #include "EnumTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 #include "oatpp/macro/codegen.hpp"
 
 #include <unordered_map>

test/oatpp/core/data/mapping/type/InterpretationTest.cpp

@@ -26,7 +26,7 @@
 
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/core/data/mapping/TypeResolver.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 #include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {

test/oatpp/core/data/mapping/type/ListTest.cpp

@@ -24,7 +24,7 @@
 
 #include "ListTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/ObjectTest.cpp

@@ -27,7 +27,7 @@
 #include "oatpp/json/ObjectMapper.hpp"
 
 #include "oatpp/macro/codegen.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include "oatpp-test/Checker.hpp"
 

test/oatpp/core/data/mapping/type/ObjectWrapperTest.cpp

@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 #include "ObjectWrapperTest.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/PairListTest.cpp

@@ -24,7 +24,7 @@
 
 #include "PairListTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/PrimitiveTest.cpp

@@ -24,7 +24,7 @@
 
 #include "PrimitiveTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/StringTest.cpp

@@ -24,7 +24,7 @@
 
 #include "StringTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 #include <functional>
 

test/oatpp/core/data/mapping/type/TypeTest.cpp

@@ -25,7 +25,7 @@
 #include "TypeTest.hpp"
 
 #include "oatpp/macro/codegen.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
   

test/oatpp/core/data/mapping/type/UnorderedMapTest.cpp

@@ -24,7 +24,7 @@
 
 #include "UnorderedMapTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/UnorderedSetTest.cpp

@@ -24,7 +24,7 @@
 
 #include "UnorderedSetTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/mapping/type/VectorTest.cpp

@@ -24,7 +24,7 @@
 
 #include "VectorTest.hpp"
 
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 

test/oatpp/core/data/share/LazyStringMapTest.cpp

@@ -25,7 +25,7 @@
 #include "LazyStringMapTest.hpp"
 
 #include "oatpp/core/data/share/LazyStringMap.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace share {
 

test/oatpp/web/app/DTOs.hpp

@@ -26,7 +26,7 @@
 #define oatpp_test_web_app_DTOs_hpp
 
 #include "oatpp/macro/codegen.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace app {
 

test/oatpp/web/server/HttpRouterTest.cpp

@@ -25,7 +25,7 @@
 #include "HttpRouterTest.hpp"
 
 #include "oatpp/web/server/HttpRouter.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/Types.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace server {