THRIFT-292. Make the #includes in fb303 match the rest of Thrift

Specifically, by removing the "thrift/" prefix.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@741826 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/contrib/fb303/cpp/FacebookBase.h b/contrib/fb303/cpp/FacebookBase.h
index 174271b..6281cdf 100644 (file)
--- a/contrib/fb303/cpp/FacebookBase.h
+++ b/contrib/fb303/cpp/FacebookBase.h
@@ -9,8 +9,8 @@
 
 #include "FacebookService.h"
 
-#include "thrift/server/TServer.h"
-#include "thrift/concurrency/Mutex.h"
+#include "server/TServer.h"
+#include "concurrency/Mutex.h"
 
 #include <time.h>
 #include <string>

diff --git a/contrib/fb303/cpp/ServiceTracker.cpp b/contrib/fb303/cpp/ServiceTracker.cpp
index 8dc150d..d510cf7 100644 (file)
--- a/contrib/fb303/cpp/ServiceTracker.cpp
+++ b/contrib/fb303/cpp/ServiceTracker.cpp
@@ -8,7 +8,7 @@
 
 #include "FacebookBase.h"
 #include "ServiceTracker.h"
-#include "thrift/concurrency/ThreadManager.h"
+#include "concurrency/ThreadManager.h"
 
 using namespace std;
 using namespace facebook::fb303;

diff --git a/contrib/fb303/cpp/ServiceTracker.h b/contrib/fb303/cpp/ServiceTracker.h
index c8e4529..fb7e62e 100644 (file)
--- a/contrib/fb303/cpp/ServiceTracker.h
+++ b/contrib/fb303/cpp/ServiceTracker.h
@@ -87,7 +87,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 
-#include "thrift/concurrency/Mutex.h"
+#include "concurrency/Mutex.h"
 
 
 namespace facebook { namespace thrift { namespace concurrency {