From 2cf02b6fd08bb9be29bdbe5188f35f2155c0c843 Mon Sep 17 00:00:00 2001 From: lganzzzo Date: Sat, 25 Jan 2020 23:58:14 +0700 Subject: [PATCH] Update to the latest oatpp API version --- CMakeLists.txt | 2 +- src/oatpp-libressl/client/ConnectionProvider.cpp | 2 +- src/oatpp-libressl/client/ConnectionProvider.hpp | 2 +- src/oatpp-libressl/server/ConnectionProvider.cpp | 2 +- src/oatpp-libressl/server/ConnectionProvider.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4663a65..67a60a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ## use these variables to configure module installation set(OATPP_THIS_MODULE_NAME oatpp-libressl) ## name of the module (also name of folders in installation dirs) -set(OATPP_THIS_MODULE_VERSION "0.19.12") ## version of the module (also sufix of folders in installation dirs) +set(OATPP_THIS_MODULE_VERSION "1.0.0") ## version of the module (also sufix of folders in installation dirs) set(OATPP_THIS_MODULE_LIBRARIES oatpp-libressl) ## list of libraries to find when find_package is called set(OATPP_THIS_MODULE_TARGETS oatpp-libressl) ## list of targets to install set(OATPP_THIS_MODULE_DIRECTORIES oatpp-libressl) ## list of directories to install diff --git a/src/oatpp-libressl/client/ConnectionProvider.cpp b/src/oatpp-libressl/client/ConnectionProvider.cpp index 56fb07c..8f387a2 100644 --- a/src/oatpp-libressl/client/ConnectionProvider.cpp +++ b/src/oatpp-libressl/client/ConnectionProvider.cpp @@ -57,7 +57,7 @@ std::shared_ptr ConnectionProvider::createShared(const std:: return std::shared_ptr(new ConnectionProvider(config, streamProvider)); } -std::shared_ptr ConnectionProvider::createShared(const std::shared_ptr& config, const oatpp::String& host, v_word16 port) { +std::shared_ptr ConnectionProvider::createShared(const std::shared_ptr& config, const oatpp::String& host, v_uint16 port) { return createShared(config, oatpp::network::client::SimpleTCPConnectionProvider::createShared(host, port)); } diff --git a/src/oatpp-libressl/client/ConnectionProvider.hpp b/src/oatpp-libressl/client/ConnectionProvider.hpp index 5864ff3..a7e0448 100644 --- a/src/oatpp-libressl/client/ConnectionProvider.hpp +++ b/src/oatpp-libressl/client/ConnectionProvider.hpp @@ -68,7 +68,7 @@ class ConnectionProvider : public base::Countable, public oatpp::network::Client * @param port - port. * @return - `std::shared_ptr` to ConnectionProvider. */ - static std::shared_ptr createShared(const std::shared_ptr& config, const oatpp::String& host, v_word16 port); + static std::shared_ptr createShared(const std::shared_ptr& config, const oatpp::String& host, v_uint16 port); /** * Implements &id:oatpp::network::ConnectionProvider::close;. Here does nothing. diff --git a/src/oatpp-libressl/server/ConnectionProvider.cpp b/src/oatpp-libressl/server/ConnectionProvider.cpp index f5f6555..c917610 100644 --- a/src/oatpp-libressl/server/ConnectionProvider.cpp +++ b/src/oatpp-libressl/server/ConnectionProvider.cpp @@ -50,7 +50,7 @@ std::shared_ptr ConnectionProvider::createShared(const std:: return std::shared_ptr(new ConnectionProvider(config, streamProvider)); } -std::shared_ptr ConnectionProvider::createShared(const std::shared_ptr& config, v_word16 port) { +std::shared_ptr ConnectionProvider::createShared(const std::shared_ptr& config, v_uint16 port) { return createShared(config, oatpp::network::server::SimpleTCPConnectionProvider::createShared(port)); } diff --git a/src/oatpp-libressl/server/ConnectionProvider.hpp b/src/oatpp-libressl/server/ConnectionProvider.hpp index a89e3ad..1810de6 100644 --- a/src/oatpp-libressl/server/ConnectionProvider.hpp +++ b/src/oatpp-libressl/server/ConnectionProvider.hpp @@ -70,7 +70,7 @@ class ConnectionProvider : public oatpp::base::Countable, public oatpp::network: * @param port - port to listen on. * @return - `std::shared_ptr` to ConnectionProvider. */ - static std::shared_ptr createShared(const std::shared_ptr& config, v_word16 port); + static std::shared_ptr createShared(const std::shared_ptr& config, v_uint16 port); /**