You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2010/10/25 14:36:04 UTC

svn commit: r1027092 - in /incubator/thrift/trunk/lib/cpp/src: Thrift.h concurrency/Mutex.cpp server/TNonblockingServer.cpp

Author: roger
Date: Mon Oct 25 12:36:04 2010
New Revision: 1027092

URL: http://svn.apache.org/viewvc?rev=1027092&view=rev
Log:
THRIFT-916 partial commit of v3-fix-all-warnings.patch and member initialization in Thrift.h

Modified:
    incubator/thrift/trunk/lib/cpp/src/Thrift.h
    incubator/thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp
    incubator/thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp

Modified: incubator/thrift/trunk/lib/cpp/src/Thrift.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/Thrift.h?rev=1027092&r1=1027091&r2=1027092&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/Thrift.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/Thrift.h Mon Oct 25 12:36:04 2010
@@ -114,7 +114,8 @@ extern TOutput GlobalOutput;
 
 class TException : public std::exception {
  public:
-  TException() {}
+  TException():
+    message_() {}
 
   TException(const std::string& message) :
     message_(message) {}

Modified: incubator/thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp?rev=1027092&r1=1027091&r2=1027092&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp Mon Oct 25 12:36:04 2010
@@ -189,6 +189,7 @@ void Mutex::DEFAULT_INITIALIZER(void* ar
   assert(ret == 0);
 }
 
+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) || defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
 static void init_with_kind(pthread_mutex_t* mutex, int kind) {
   pthread_mutexattr_t mutexattr;
   int ret = pthread_mutexattr_init(&mutexattr);
@@ -204,6 +205,7 @@ static void init_with_kind(pthread_mutex
   ret = pthread_mutexattr_destroy(&mutexattr);
   assert(ret == 0);
 }
+#endif
 
 #ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
 void Mutex::ADAPTIVE_INITIALIZER(void* arg) {

Modified: incubator/thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp?rev=1027092&r1=1027091&r2=1027092&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp Mon Oct 25 12:36:04 2010
@@ -265,9 +265,6 @@ void TConnection::workSocket() {
  * to, or finished receiving the data that it needed to.
  */
 void TConnection::transition() {
-
-  int sz = 0;
-
   // Switch upon the state that we are currently in and move to a new state
   switch (appState_) {