Thrift: standardize coding style

Summary: Standardize indentation, spacing, #defines etc.


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664784 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/TimerManager.h b/lib/cpp/src/concurrency/TimerManager.h
index c0e6340..50a0c13 100644
--- a/lib/cpp/src/concurrency/TimerManager.h
+++ b/lib/cpp/src/concurrency/TimerManager.h
@@ -1,27 +1,26 @@
-#if !defined(_concurrency_TimerManager_h_)
-#define _concurrency_TimerManager_h_ 1
+#ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_
+#define _THRIFT_CONCURRENCY_TIMERMANAGER_H_ 1
 
 #include "Exception.h"
 #include "Monitor.h"
 #include "Thread.h"
 
 #include <boost/shared_ptr.hpp>
-
 #include <map>
-
 #include <time.h>
 
 namespace facebook { namespace thrift { namespace concurrency { 
 
 using namespace boost;
 
-/** Timer Manager 
-	  
-    This class dispatches timer tasks when they fall due.
-	  
-    @author marc
-    @version $Id:$ */
-
+/**
+ * Timer Manager 
+ * 
+ * This class dispatches timer tasks when they fall due.
+ *  
+ * @author marc
+ * @version $Id:$
+ */
 class TimerManager {
 
  public:
@@ -34,39 +33,46 @@
 
   virtual void threadFactory(shared_ptr<const ThreadFactory> value);
 
-  /** Starts the timer manager service 
-
-      @throws IllegalArgumentException Missing thread factory attribute */
-
+  /**
+   * Starts the timer manager service 
+   *
+   * @throws IllegalArgumentException Missing thread factory attribute
+   */
   virtual void start();
 
-  /** Stops the timer manager service */
-
+  /**
+   * Stops the timer manager service
+   */
   virtual void stop();
 
   virtual size_t taskCount() const ;
 
-  /** Adds a task to be executed at some time in the future by a worker thread.
-      
-      @param task The task to execute
-      @param timeout Time in milliseconds to delay before executing task */
-
+  /**
+   * Adds a task to be executed at some time in the future by a worker thread.
+   * 
+   * @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);
 
-  /** Adds a task to be executed at some time in the future by a worker thread.
-      
-      @param task The task to execute
-      @param timeout Absolute time in the future to execute task. */ 
-
+  /**
+   * Adds a task to be executed at some time in the future by a worker thread.
+   * 
+   * @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);
 
-  /** Removes a pending task 
-
-      @throws NoSuchTaskException Specified task doesn't exist.  It was either processed already or this call was made for a task that
-      was never added to this timer
-
-      @throws UncancellableTaskException Specified task is already being executed or has completed execution. */
-
+  /**
+   * Removes a pending task 
+   *
+   * @throws NoSuchTaskException Specified task doesn't exist. It was either
+   *                             processed already or this call was made for a
+   *                             task that was never added to this timer
+   *
+   * @throws UncancellableTaskException Specified task is already being
+   *                                    executed or has completed execution.
+   */
   virtual void remove(shared_ptr<Runnable> task);
 
   enum STATE {
@@ -80,31 +86,19 @@
   virtual const STATE state() const;
 
  private:
-  
   shared_ptr<const ThreadFactory> _threadFactory;
-  
   class Task;
-
   friend class Task;
-
   std::multimap<long long, shared_ptr<Task> > _taskMap;
-
   size_t _taskCount;
-
   Monitor _monitor;
-
   STATE _state;
-
   class Dispatcher;
-
   friend class Dispatcher;
-
   shared_ptr<Dispatcher> _dispatcher;
-
   shared_ptr<Thread> _dispatcherThread;
-
 };
 
 }}} // facebook::thrift::concurrency
 
-#endif // !defined(_concurrency_TimerManager_h_)
+#endif // #ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_