renaming && typo fix

qipeng · qipeng · commit b036c1df7741 · 2014-08-30T16:32:53.000-07:00
diff --git a/include/caffe/internal_thread.hpp b/include/caffe/internal_thread.hpp
@@ -7,20 +7,20 @@ namespace caffe {
 
 /**
  * A minimal wrapper for boost::thread to force host compilation for boost
- * Defined in caffe/util/thread_wrapper.cpp
+ * Defined in caffe/util/thread.hpp
  */
-class ThreadWrapper {
+class Thread {
  public:
   template<typename Callable, class A1>
-  ThreadWrapper(Callable func, A1 a1);
+  Thread(Callable func, A1 a1);
   void join();
   bool joinable();
  private:
   void* thread_;
 };
 
 /**
- * Virutal class encapsulate boost::thread for use in base class
+ * Virtual class encapsulate boost::thread for use in base class
  * The child class will acquire the ability to run a single thread,
  * by reimplementing the virutal function InternalThreadEntry.
  */
diff --git a/include/caffe/util/thread.hpp b/include/caffe/util/thread.hpp
@@ -1,5 +1,5 @@
-#ifndef CAFFE_THREAD_WRAPPER_CPP_HPP_
-#define CAFFE_THREAD_WRAPPER_CPP_HPP_
+#ifndef CAFFE_THREAD_CPP_HPP_
+#define CAFFE_THREAD_CPP_HPP_
 
 #include <boost/thread.hpp>
 #include "caffe/common.hpp"
@@ -8,15 +8,15 @@
 namespace caffe {
 
 template<typename Callable, class A1>
-ThreadWrapper::ThreadWrapper(Callable func, A1 a1) {
+Thread::Thread(Callable func, A1 a1) {
   this->thread_ = new boost::thread(func, a1);
 }
 
-void ThreadWrapper::join() {
+void Thread::join() {
   static_cast<boost::thread*>(this->thread_)->join();
 }
 
-bool ThreadWrapper::joinable() {
+bool Thread::joinable() {
   return static_cast<boost::thread*>(this->thread_)->joinable();
 }
 
diff --git a/src/caffe/internal_thread.cpp b/src/caffe/internal_thread.cpp
@@ -1,6 +1,6 @@
 #include "caffe/internal_thread.hpp"
 
-#include "caffe/util/thread_wrapper.hpp"
+#include "caffe/util/thread.hpp"
 
 namespace caffe {
 
