forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(conan-io#16872) drogon: add version 1.8.4, update dependencies
* drogon: add version 1.8.4, update dependencies * update openssl * update openssl, sqlite3 * make trantor transitive_libs * Added jsoncpp transitive_libs=True param * Added package_type and with_yaml_cpp option (optional requirement) * support C++14 build on msvc * make boost transitive_headers=True * add /Zc:__cplusplus on MSVC * add /EHsc flag for msvc --------- Co-authored-by: Francisco Ramirez de Anton <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: Rubén Rincón Blanco <[email protected]>
- Loading branch information
4 people
authored
Jul 3, 2023
1 parent
b92ff4e
commit bd635eb
Showing
9 changed files
with
321 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
recipes/drogon/all/patches/1.7.5-0005-remove-msvc-check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| diff --git a/lib/inc/drogon/utils/any.h b/lib/inc/drogon/utils/any.h | ||
| index 63abd2e..8ac74d8 100644 | ||
| --- a/lib/inc/drogon/utils/any.h | ||
| +++ b/lib/inc/drogon/utils/any.h | ||
| @@ -13,7 +13,7 @@ | ||
| */ | ||
|
|
||
| #pragma once | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| #include <any> | ||
| #else | ||
| #include <boost/any.hpp> | ||
| @@ -21,7 +21,7 @@ | ||
|
|
||
| namespace drogon | ||
| { | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| using std::any; | ||
| using std::any_cast; | ||
| #else | ||
| diff --git a/lib/inc/drogon/utils/optional.h b/lib/inc/drogon/utils/optional.h | ||
| index 2dde172..297a819 100644 | ||
| --- a/lib/inc/drogon/utils/optional.h | ||
| +++ b/lib/inc/drogon/utils/optional.h | ||
| @@ -13,7 +13,7 @@ | ||
| */ | ||
|
|
||
| #pragma once | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| #include <optional> | ||
| #else | ||
| #include <boost/optional.hpp> | ||
| @@ -21,9 +21,9 @@ | ||
|
|
||
| namespace drogon | ||
| { | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| using std::optional; | ||
| #else | ||
| using boost::optional; | ||
| #endif | ||
| -} // namespace drogon | ||
| \ No newline at end of file | ||
| +} // namespace drogon | ||
| diff --git a/lib/inc/drogon/utils/string_view.h b/lib/inc/drogon/utils/string_view.h | ||
| index a2362b7..074d05f 100644 | ||
| --- a/lib/inc/drogon/utils/string_view.h | ||
| +++ b/lib/inc/drogon/utils/string_view.h | ||
| @@ -13,7 +13,7 @@ | ||
| */ | ||
|
|
||
| #pragma once | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| #include <string_view> | ||
| #else | ||
| #include <stdint.h> | ||
| @@ -25,7 +25,7 @@ | ||
|
|
||
| namespace drogon | ||
| { | ||
| -#if __cplusplus >= 201703L || (defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus >= 201703L | ||
| using std::string_view; | ||
| #else | ||
| using boost::string_view; | ||
| @@ -40,10 +40,10 @@ inline LogStream &operator<<(LogStream &ls, const drogon::string_view &v) | ||
| } | ||
| } // namespace trantor | ||
|
|
||
| -#if __cplusplus < 201703L && !(defined _MSC_VER && _MSC_VER > 1900) | ||
| +#if __cplusplus < 201703L | ||
| namespace drogon | ||
| { | ||
| -#ifndef _MSC_VER | ||
| +#if 1 | ||
| template <size_t N> | ||
| struct StringViewHasher; | ||
|
|
||
| @@ -319,7 +319,7 @@ struct hash<drogon::string_view> | ||
| size_t operator()(const drogon::string_view &__str) const noexcept | ||
| { | ||
| // MSVC is having problems with non-aligned strings | ||
| -#ifndef _MSC_VER | ||
| +#if 1 | ||
| return drogon::StringViewHasher<sizeof(size_t)>()(__str); | ||
| #else | ||
| return drogon::ShortStringViewHasher(__str); |
Oops, something went wrong.