[sr-dev] git:5.5:b2d6fefe: ndb_cassandra: update include paths as expected by thrift lib package

Daniel-Constantin Mierla miconda at gmail.com
Wed May 5 10:14:07 CEST 2021


Module: kamailio
Branch: 5.5
Commit: b2d6fefef14d20fc9291bfff5f959860895a7bff
URL: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f959860895a7bff

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2021-05-05T10:13:34+02:00

ndb_cassandra: update include paths as expected by thrift lib package

(cherry picked from commit 3511e0a975395a14f48fe5b6d60435315f7638dc)

---

Modified: src/modules/ndb_cassandra/Cassandra.h
Modified: src/modules/ndb_cassandra/cassandra_types.h
Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp

---

Diff:  https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f959860895a7bff.diff
Patch: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f959860895a7bff.patch

---

diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h
index 6e453d742e..210d7a9234 100644
--- a/src/modules/ndb_cassandra/Cassandra.h
+++ b/src/modules/ndb_cassandra/Cassandra.h
@@ -6,7 +6,7 @@
 #ifndef Cassandra_H
 #define Cassandra_H
 
-#include <TProcessor.h>
+#include <thrift/TProcessor.h>
 #include "cassandra_types.h"
 
 namespace org { namespace apache { namespace cassandra {
diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h
index 9150a5c0dd..1aaa871a4b 100644
--- a/src/modules/ndb_cassandra/cassandra_types.h
+++ b/src/modules/ndb_cassandra/cassandra_types.h
@@ -6,10 +6,10 @@
 #ifndef cassandra_TYPES_H
 #define cassandra_TYPES_H
 
-#include <Thrift.h>
-#include <TApplicationException.h>
-#include <protocol/TProtocol.h>
-#include <transport/TTransport.h>
+#include <thrift/Thrift.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TTransport.h>
 
 
 
diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp
index 6f40241a59..0c6c4e4aa3 100644
--- a/src/modules/ndb_cassandra/thrift_wrapper.cpp
+++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp
@@ -1,11 +1,11 @@
-#include "Thrift.h"
-#include "transport/TSocket.h"
-#include "transport/TTransport.h"
-#include "transport/TBufferTransports.h"
-#include "protocol/TProtocol.h"
-#include "protocol/TBinaryProtocol.h"
-#include "Cassandra.h"
+#include <thrift/Thrift.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TTransport.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
 
+#include "Cassandra.h"
 #include "thrift_wrapper.h"
 
 using namespace std;




More information about the sr-dev mailing list