Get rid of all the using namespace and using boost:: declarations in Thrift header files
Summary: To remove upstream dependencies. Still keeping some specific using directives around.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665047 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/TimerManager.h b/lib/cpp/src/concurrency/TimerManager.h
index 4e83c9e..a150e8a 100644
--- a/lib/cpp/src/concurrency/TimerManager.h
+++ b/lib/cpp/src/concurrency/TimerManager.h
@@ -17,8 +17,6 @@
namespace facebook { namespace thrift { namespace concurrency {
-using namespace boost;
-
/**
* Timer Manager
*
@@ -35,9 +33,9 @@
virtual ~TimerManager();
- virtual shared_ptr<const ThreadFactory> threadFactory() const;
+ virtual boost::shared_ptr<const ThreadFactory> threadFactory() const;
- virtual void threadFactory(shared_ptr<const ThreadFactory> value);
+ virtual void threadFactory(boost::shared_ptr<const ThreadFactory> value);
/**
* Starts the timer manager service
@@ -59,7 +57,7 @@
* @param task The task to execute
* @param timeout Time in milliseconds to delay before executing task
*/
- virtual void add(shared_ptr<Runnable> task, long long timeout);
+ virtual void add(boost::shared_ptr<Runnable> task, long long timeout);
/**
* Adds a task to be executed at some time in the future by a worker thread.
@@ -67,7 +65,7 @@
* @param task The task to execute
* @param timeout Absolute time in the future to execute task.
*/
- virtual void add(shared_ptr<Runnable> task, const struct timespec& timeout);
+ virtual void add(boost::shared_ptr<Runnable> task, const struct timespec& timeout);
/**
* Removes a pending task
@@ -79,7 +77,7 @@
* @throws UncancellableTaskException Specified task is already being
* executed or has completed execution.
*/
- virtual void remove(shared_ptr<Runnable> task);
+ virtual void remove(boost::shared_ptr<Runnable> task);
enum STATE {
UNINITIALIZED,
@@ -92,17 +90,17 @@
virtual const STATE state() const;
private:
- shared_ptr<const ThreadFactory> threadFactory_;
+ boost::shared_ptr<const ThreadFactory> threadFactory_;
class Task;
friend class Task;
- std::multimap<long long, shared_ptr<Task> > taskMap_;
+ std::multimap<long long, boost::shared_ptr<Task> > taskMap_;
size_t taskCount_;
Monitor monitor_;
STATE state_;
class Dispatcher;
friend class Dispatcher;
- shared_ptr<Dispatcher> dispatcher_;
- shared_ptr<Thread> dispatcherThread_;
+ boost::shared_ptr<Dispatcher> dispatcher_;
+ boost::shared_ptr<Thread> dispatcherThread_;
};
}}} // facebook::thrift::concurrency