Browse Source

Update Oat++ to the latest version. (#5894)

Leonid Stryzhevskyi 5 years ago
parent
commit
9a9b24419e

+ 1 - 1
frameworks/C++/oatpp/oatpp-async-no-mp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 27c46444dbac6af79172b1600c7fcc99ff6df42b
+RUN git checkout 4cd37af26ffa55231f11649106a1bb33a3244cd1
 
 WORKDIR /test/oatpp/build
 

+ 1 - 1
frameworks/C++/oatpp/oatpp-async.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 27c46444dbac6af79172b1600c7fcc99ff6df42b
+RUN git checkout 4cd37af26ffa55231f11649106a1bb33a3244cd1
 
 WORKDIR /test/oatpp/build
 

+ 1 - 1
frameworks/C++/oatpp/oatpp-no-mp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 27c46444dbac6af79172b1600c7fcc99ff6df42b
+RUN git checkout 4cd37af26ffa55231f11649106a1bb33a3244cd1
 
 WORKDIR /test/oatpp/build
 

+ 1 - 1
frameworks/C++/oatpp/oatpp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 27c46444dbac6af79172b1600c7fcc99ff6df42b
+RUN git checkout 4cd37af26ffa55231f11649106a1bb33a3244cd1
 
 WORKDIR /test/oatpp/build
 

+ 1 - 1
frameworks/C++/oatpp/src-async/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${project_name}
 
 ## link libs
 
-find_package(oatpp  1.0.0 REQUIRED)
+find_package(oatpp  1.1.0 REQUIRED)
 find_package(mimalloc 1.0 REQUIRED)
 
 target_link_libraries(${project_name}

+ 3 - 3
frameworks/C++/oatpp/src-async/src/dto/DTOs.hpp

@@ -2,14 +2,14 @@
 #ifndef DTOs_hpp
 #define DTOs_hpp
 
-#include "oatpp/core/data/mapping/type/Object.hpp"
+#include "oatpp/core/Types.hpp"
 #include "oatpp/core/macro/codegen.hpp"
 
 #include OATPP_CODEGEN_BEGIN(DTO)
 
-class MessageDto : public oatpp::data::mapping::type::Object {
+class MessageDto : public oatpp::DTO {
 
-  DTO_INIT(MessageDto, Object)
+  DTO_INIT(MessageDto, DTO)
 
   DTO_FIELD(String, message);
 

+ 1 - 1
frameworks/C++/oatpp/src-thread/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${project_name}
 
 ## link libs
 
-find_package(oatpp  1.0.0 REQUIRED)
+find_package(oatpp  1.1.0 REQUIRED)
 find_package(mimalloc 1.0 REQUIRED)
 
 target_link_libraries(${project_name}

+ 3 - 3
frameworks/C++/oatpp/src-thread/src/dto/DTOs.hpp

@@ -2,14 +2,14 @@
 #ifndef DTOs_hpp
 #define DTOs_hpp
 
-#include "oatpp/core/data/mapping/type/Object.hpp"
+#include "oatpp/core/Types.hpp"
 #include "oatpp/core/macro/codegen.hpp"
 
 #include OATPP_CODEGEN_BEGIN(DTO)
 
-class MessageDto : public oatpp::data::mapping::type::Object {
+class MessageDto : public oatpp::DTO {
 
-  DTO_INIT(MessageDto, Object)
+  DTO_INIT(MessageDto, DTO)
 
   DTO_FIELD(String, message);