diff --git a/lib/cpp/src/server/TThreadPoolServer.cpp b/lib/cpp/src/server/TThreadPoolServer.cpp
index a271934..26eb373 100644
--- a/lib/cpp/src/server/TThreadPoolServer.cpp
+++ b/lib/cpp/src/server/TThreadPoolServer.cpp
@@ -156,7 +156,12 @@
 
 }
 
-long long TThreadPoolServer::timeout() const {return timeout_;}
-void TThreadPoolServer::timeout(long long value) {timeout_ = value;}
+int64_t TThreadPoolServer::getTimeout() const {
+  return timeout_;
+}
+
+void TThreadPoolServer::setTimeout(int64_t value) {
+  timeout_ = value;
+}
 
 }}} // facebook::thrift::server
diff --git a/lib/cpp/src/server/TThreadPoolServer.h b/lib/cpp/src/server/TThreadPoolServer.h
index b8b64f2..769db47 100644
--- a/lib/cpp/src/server/TThreadPoolServer.h
+++ b/lib/cpp/src/server/TThreadPoolServer.h
@@ -42,8 +42,9 @@
 
   virtual void serve();
 
-  virtual long long timeout() const;
-  virtual void timeout(long long value);
+  virtual int64_t getTimeout() const;
+
+  virtual void setTimeout(int64_t value);
   
   virtual void stop() {
     stop_ = true;
@@ -56,7 +57,7 @@
 
   volatile bool stop_;
 
-  volatile long long timeout_;
+  volatile int64_t timeout_;
   
 };