Converted concurrency classes to use boost::shared_ptr and boost::weak_ptr:
Wrapped all thrift code in facebook::thrift:: namespace
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664735 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/Util.h b/lib/cpp/src/concurrency/Util.h
index 6e8891d..fc24f74 100644
--- a/lib/cpp/src/concurrency/Util.h
+++ b/lib/cpp/src/concurrency/Util.h
@@ -5,7 +5,7 @@
#include <assert.h>
#include <stddef.h>
-#include <sys/time.h>
+#include <time.h>
namespace facebook { namespace thrift { namespace concurrency {
@@ -55,9 +55,9 @@
struct timespec now;
- assert(clock_gettime(&now, NULL) == 0);
+ assert(clock_gettime(CLOCK_REALTIME, &now) == 0);
- return = (now.tv_sec * MS_PER_S) + (now.tv_nsec / NS_PER_MS) + (now.tv_nsec % NS_PER_MS >= 500000 ? 1 : 0) ;
+ return (now.tv_sec * MS_PER_S) + (now.tv_nsec / NS_PER_MS) + (now.tv_nsec % NS_PER_MS >= 500000 ? 1 : 0) ;
#elif defined(HAVE_GETTIMEOFDAY)
@@ -66,11 +66,11 @@
assert(gettimeofday(&now, NULL) == 0);
return (((long long)now.tv_sec) * MS_PER_S) + (now.tv_usec / MS_PER_S) + (now.tv_usec % MS_PER_S >= 500 ? 1 : 0);
+
#endif // defined(HAVE_GETTIMEDAY)
}
};
-
}}} // facebook::thrift::concurrency
#endif // !defined(_concurrency_Util_h_)