From 858519aac58560a5b15f0c939ab4398dc33fbd4f Mon Sep 17 00:00:00 2001 From: David Reiss Date: Sat, 7 Feb 2009 02:36:50 +0000 Subject: [PATCH] THRIFT-292. s/facebook::thrift/apache::thrift/ in contrib/fb303/cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@741827 13f79535-47bb-0310-9956-ffa450edef68 --- contrib/fb303/cpp/FacebookBase.cpp | 2 +- contrib/fb303/cpp/FacebookBase.h | 6 +++--- contrib/fb303/cpp/ServiceTracker.cpp | 2 +- contrib/fb303/cpp/ServiceTracker.h | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/fb303/cpp/FacebookBase.cpp b/contrib/fb303/cpp/FacebookBase.cpp index d9421065c..41a37a24b 100644 --- a/contrib/fb303/cpp/FacebookBase.cpp +++ b/contrib/fb303/cpp/FacebookBase.cpp @@ -7,7 +7,7 @@ #include "FacebookBase.h" using namespace facebook::fb303; -using facebook::thrift::concurrency::Guard; +using apache::thrift::concurrency::Guard; FacebookBase::FacebookBase(std::string name) : name_(name) { diff --git a/contrib/fb303/cpp/FacebookBase.h b/contrib/fb303/cpp/FacebookBase.h index 6281cdf47..0efe65539 100644 --- a/contrib/fb303/cpp/FacebookBase.h +++ b/contrib/fb303/cpp/FacebookBase.h @@ -18,9 +18,9 @@ namespace facebook { namespace fb303 { -using facebook::thrift::concurrency::Mutex; -using facebook::thrift::concurrency::ReadWriteMutex; -using facebook::thrift::server::TServer; +using apache::thrift::concurrency::Mutex; +using apache::thrift::concurrency::ReadWriteMutex; +using apache::thrift::server::TServer; struct ReadWriteInt : ReadWriteMutex {int64_t value;}; struct ReadWriteCounterMap : ReadWriteMutex, diff --git a/contrib/fb303/cpp/ServiceTracker.cpp b/contrib/fb303/cpp/ServiceTracker.cpp index d510cf786..bb3f21907 100644 --- a/contrib/fb303/cpp/ServiceTracker.cpp +++ b/contrib/fb303/cpp/ServiceTracker.cpp @@ -12,7 +12,7 @@ using namespace std; using namespace facebook::fb303; -using namespace facebook::thrift::concurrency; +using namespace apache::thrift::concurrency; uint64_t ServiceTracker::CHECKPOINT_MINIMUM_INTERVAL_SECONDS = 60; diff --git a/contrib/fb303/cpp/ServiceTracker.h b/contrib/fb303/cpp/ServiceTracker.h index fb7e62e2d..1fa0c6336 100644 --- a/contrib/fb303/cpp/ServiceTracker.h +++ b/contrib/fb303/cpp/ServiceTracker.h @@ -90,7 +90,7 @@ #include "concurrency/Mutex.h" -namespace facebook { namespace thrift { namespace concurrency { +namespace apache { namespace thrift { namespace concurrency { class ThreadManager; }}} @@ -132,20 +132,20 @@ public: Stopwatch::Unit stopwatchUnit = Stopwatch::UNIT_MILLISECONDS); - void setThreadManager(boost::shared_ptr threadManager); + void setThreadManager(boost::shared_ptr threadManager); private: facebook::fb303::FacebookBase *handler_; void (*logMethod_)(int, const std::string &); - boost::shared_ptr threadManager_; + boost::shared_ptr threadManager_; bool featureCheckpoint_; bool featureStatusCheck_; bool featureThreadCheck_; Stopwatch::Unit stopwatchUnit_; - facebook::thrift::concurrency::Mutex statisticsMutex_; + apache::thrift::concurrency::Mutex statisticsMutex_; time_t checkpointTime_; uint64_t checkpointServices_; uint64_t checkpointDuration_;