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 2014/02/09 11:31:23 UTC
git commit: THRIFT-2352 msvc failed to compile thrift tests
Updated Branches:
refs/heads/master 2f51f327e -> 22888ce3a
THRIFT-2352 msvc failed to compile thrift tests
Patch: Sergei Nikulov & Roger Meier
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/22888ce3
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/22888ce3
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/22888ce3
Branch: refs/heads/master
Commit: 22888ce3a84f38c1478f38ad0d1ff3ed7fdf5f39
Parents: 2f51f32
Author: Roger Meier <ro...@apache.org>
Authored: Sun Feb 9 11:31:02 2014 +0100
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Feb 9 11:31:02 2014 +0100
----------------------------------------------------------------------
lib/cpp/test/Benchmark.cpp | 6 +++---
lib/cpp/test/JSONProtoTest.cpp | 2 +-
test/DebugProtoTest.thrift | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/22888ce3/lib/cpp/test/Benchmark.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/test/Benchmark.cpp b/lib/cpp/test/Benchmark.cpp
index 9ee2586..286d635 100644
--- a/lib/cpp/test/Benchmark.cpp
+++ b/lib/cpp/test/Benchmark.cpp
@@ -35,15 +35,15 @@ public:
timeval vStart;
Timer() {
- gettimeofday(&vStart, 0);
+ THRIFT_GETTIMEOFDAY(&vStart, 0);
}
void start() {
- gettimeofday(&vStart, 0);
+ THRIFT_GETTIMEOFDAY(&vStart, 0);
}
double frame() {
timeval vEnd;
- gettimeofday(&vEnd, 0);
+ THRIFT_GETTIMEOFDAY(&vEnd, 0);
double dstart = vStart.tv_sec + ((double)vStart.tv_usec / 1000000.0);
double dend = vEnd.tv_sec + ((double)vEnd.tv_usec / 1000000.0);
return dend - dstart;
http://git-wip-us.apache.org/repos/asf/thrift/blob/22888ce3/lib/cpp/test/JSONProtoTest.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/test/JSONProtoTest.cpp b/lib/cpp/test/JSONProtoTest.cpp
index be8f426..a3259c0 100644
--- a/lib/cpp/test/JSONProtoTest.cpp
+++ b/lib/cpp/test/JSONProtoTest.cpp
@@ -134,7 +134,7 @@ int main() {
dub.neginf = -HUGE_VAL;
dub.repeating = 10.0/3.0;
dub.big = 1E+305;
- dub.small = 1E-305;
+ dub.tiny = 1E-305;
dub.zero = 0.0;
dub.negzero = -0.0;
cout << apache::thrift::ThriftJSONString(dub) << endl << endl;
http://git-wip-us.apache.org/repos/asf/thrift/blob/22888ce3/test/DebugProtoTest.thrift
----------------------------------------------------------------------
diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift
index e2bba40..3cb3478 100644
--- a/test/DebugProtoTest.thrift
+++ b/test/DebugProtoTest.thrift
@@ -27,7 +27,7 @@ struct Doubles {
3: double neginf,
4: double repeating,
5: double big,
- 6: double small,
+ 6: double tiny,
7: double zero,
8: double negzero,
}