commit 0e8148024b4bd3f50331ad5fcc7334d4aa60949b
author Roger Meier <roger@apache.org> Fri Jan 17 21:07:58 2014 +0100
committer Roger Meier <roger@apache.org> Fri Jan 17 21:07:58 2014 +0100
tree 96f17d9346c49d03787303738fd77f44cb114ff6
parent 77369a0ecd7045aec7be0226ca4843f893bbcda0

THRIFT-2229 cpp:thrift failed to build on OSX 10.9 GM
fix test/cppÂ
Patch: Roger Meier

test/cpp/src/TestServer.cpp

diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
old mode 100644
new mode 100755
index adb8fd1..af43d72
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -85,7 +85,7 @@
   }
 
   int64_t testI64(const int64_t thing) {
-    printf("testI64(%"PRId64")\n", thing);
+    printf("testI64(%" PRId64 ")\n", thing);
     return thing;
   }
 
@@ -95,13 +95,13 @@
   }
 
   void testStruct(Xtruct& out, const Xtruct &thing) {
-    printf("testStruct({\"%s\", %d, %d, %"PRId64"})\n", thing.string_thing.c_str(), (int)thing.byte_thing, thing.i32_thing, thing.i64_thing);
+    printf("testStruct({\"%s\", %d, %d, %" PRId64 "})\n", thing.string_thing.c_str(), (int)thing.byte_thing, thing.i32_thing, thing.i64_thing);
     out = thing;
   }
 
   void testNest(Xtruct2& out, const Xtruct2& nest) {
     const Xtruct &thing = nest.struct_thing;
-    printf("testNest({%d, {\"%s\", %d, %d, %"PRId64"}, %d})\n", (int)nest.byte_thing, thing.string_thing.c_str(), (int)thing.byte_thing, thing.i32_thing, thing.i64_thing, nest.i32_thing);
+    printf("testNest({%d, {\"%s\", %d, %d, %" PRId64 "}, %d})\n", (int)nest.byte_thing, thing.string_thing.c_str(), (int)thing.byte_thing, thing.i32_thing, thing.i64_thing, nest.i32_thing);
     out = nest;
   }
 
@@ -175,7 +175,7 @@
   }
 
   UserId testTypedef(const UserId thing) {
-    printf("testTypedef(%"PRId64")\n", thing);
+    printf("testTypedef(%" PRId64 ")\n", thing);
     return thing;
   }
 
@@ -233,7 +233,7 @@
     printf(" = {");
     map<UserId, map<Numberz::type,Insanity> >::const_iterator i_iter;
     for (i_iter = insane.begin(); i_iter != insane.end(); ++i_iter) {
-      printf("%"PRId64" => {", i_iter->first);
+      printf("%" PRId64 " => {", i_iter->first);
       map<Numberz::type,Insanity>::const_iterator i2_iter;
       for (i2_iter = i_iter->second.begin();
            i2_iter != i_iter->second.end();
@@ -243,7 +243,7 @@
         map<Numberz::type, UserId>::const_iterator um;
         printf("{");
         for (um = userMap.begin(); um != userMap.end(); ++um) {
-          printf("%d => %"PRId64", ", um->first, um->second);
+          printf("%d => %" PRId64 ", ", um->first, um->second);
         }
         printf("}, ");
 
@@ -251,7 +251,7 @@
         vector<Xtruct>::const_iterator x;
         printf("{");
         for (x = xtructs.begin(); x != xtructs.end(); ++x) {
-          printf("{\"%s\", %d, %d, %"PRId64"}, ", x->string_thing.c_str(), (int)x->byte_thing, x->i32_thing, x->i64_thing);
+          printf("{\"%s\", %d, %d, %" PRId64 "}, ", x->string_thing.c_str(), (int)x->byte_thing, x->i32_thing, x->i64_thing);
         }
         printf("}");