vcpkg/ports/drogon/redis.patch
An Tao 33cd8da12d
[drogon] Update to 1.8.0 (#26639)
* [drogon] Update to 1.8.0

* fix a confilict with hiredis
2022-09-06 12:46:47 -07:00

67 lines
2.0 KiB
Diff

diff --git a/nosql_lib/redis/src/RedisClientImpl.cc b/nosql_lib/redis/src/RedisClientImpl.cc
index 15fa74b..b2f9ac1 100644
--- a/nosql_lib/redis/src/RedisClientImpl.cc
+++ b/nosql_lib/redis/src/RedisClientImpl.cc
@@ -12,6 +12,7 @@
*
*/
+#include "RedisConnection.h"
#include "RedisClientImpl.h"
#include "RedisTransactionImpl.h"
#include "../../lib/src/TaskTimeoutFlag.h"
diff --git a/nosql_lib/redis/src/RedisClientImpl.h b/nosql_lib/redis/src/RedisClientImpl.h
index d84cfab..e7c8fab 100644
--- a/nosql_lib/redis/src/RedisClientImpl.h
+++ b/nosql_lib/redis/src/RedisClientImpl.h
@@ -13,7 +13,6 @@
*/
#pragma once
-#include "RedisConnection.h"
#include <drogon/nosql/RedisClient.h>
#include <trantor/utils/NonCopyable.h>
#include <trantor/net/EventLoopThreadPool.h>
@@ -26,6 +25,8 @@ namespace drogon
{
namespace nosql
{
+class RedisConnection;
+using RedisConnectionPtr = std::shared_ptr<RedisConnection>;
class RedisClientImpl final
: public RedisClient,
public trantor::NonCopyable,
diff --git a/nosql_lib/redis/src/RedisClientLockFree.cc b/nosql_lib/redis/src/RedisClientLockFree.cc
index 2f27b64..fe225b2 100644
--- a/nosql_lib/redis/src/RedisClientLockFree.cc
+++ b/nosql_lib/redis/src/RedisClientLockFree.cc
@@ -12,6 +12,7 @@
*
*/
+#include "RedisConnection.h"
#include "RedisClientLockFree.h"
#include "RedisTransactionImpl.h"
#include "../../lib/src/TaskTimeoutFlag.h"
diff --git a/nosql_lib/redis/src/RedisClientLockFree.h b/nosql_lib/redis/src/RedisClientLockFree.h
index 00bc6c1..136f315 100644
--- a/nosql_lib/redis/src/RedisClientLockFree.h
+++ b/nosql_lib/redis/src/RedisClientLockFree.h
@@ -13,7 +13,6 @@
*/
#pragma once
-#include "RedisConnection.h"
#include <drogon/nosql/RedisClient.h>
#include <trantor/utils/NonCopyable.h>
#include <trantor/net/EventLoopThreadPool.h>
@@ -26,6 +25,8 @@ namespace drogon
{
namespace nosql
{
+class RedisConnection;
+using RedisConnectionPtr = std::shared_ptr<RedisConnection>;
class RedisClientLockFree final
: public RedisClient,
public trantor::NonCopyable,