fix cpp11 compile errors

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 214 matching lines @@
   if (Dart_IsNumber(object)) {
     buf->Printf("\"kind\":\"number\",");
   } else if (Dart_IsString(object)) {
     buf->Printf("\"kind\":\"string\",");
   } else if (Dart_IsBoolean(object)) {
     buf->Printf("\"kind\":\"boolean\",");
   } else if (Dart_IsList(object)) {
     intptr_t len = 0;
     Dart_Handle res = Dart_ListLength(object, &len);
     ASSERT_NOT_ERROR(res);
-    buf->Printf("\"kind\":\"list\",\"length\":%"Pd",", len);
+    buf->Printf("\"kind\":\"list\",\"length\":%" Pd ",", len);
   } else {
     buf->Printf("\"kind\":\"object\",");
     intptr_t class_id = 0;
     Dart_Handle res = Dart_GetObjClassId(object, &class_id);
     if (!Dart_IsError(res)) {
-      buf->Printf("\"classId\":%"Pd",", class_id);
+      buf->Printf("\"classId\":%" Pd ",", class_id);
     }
   }
   buf->Printf("\"text\":\"");
   const intptr_t max_chars = 250;
   FormatTextualValue(buf, object, max_chars);
   buf->Printf("\"");
 }
 
 
 static void FormatValueObj(dart::TextBuffer* buf, Dart_Handle object) {
   buf->Printf("{");
   FormatValue(buf, object);
   buf->Printf("}");
 }
 
 
 static void FormatRemoteObj(dart::TextBuffer* buf, Dart_Handle object) {
   intptr_t obj_id = Dart_CacheObject(object);
   ASSERT(obj_id >= 0);
-  buf->Printf("{\"objectId\":%"Pd",", obj_id);
+  buf->Printf("{\"objectId\":%" Pd ",", obj_id);
   FormatValue(buf, object);
   buf->Printf("}");
 }
 
 
 static void FormatNamedValue(dart::TextBuffer* buf,
                              Dart_Handle object_name,
                              Dart_Handle object) {
   ASSERT(Dart_IsString(object_name));
   buf->Printf("{\"name\":\"%s\",", GetStringChars(object_name));
@@ skipping 29 matching lines @@
                                     intptr_t cls_id) {
   Dart_Handle name, static_fields;
   intptr_t super_id = -1;
   intptr_t library_id = -1;
   Dart_Handle res =
       Dart_GetClassInfo(cls_id, &name, &library_id, &super_id, &static_fields);
   RETURN_IF_ERROR(res);
   RETURN_IF_ERROR(name);
   buf->Printf("{\"name\":\"%s\",", GetStringChars(name));
   if (super_id > 0) {
-    buf->Printf("\"superclassId\":%"Pd",", super_id);
+    buf->Printf("\"superclassId\":%" Pd ",", super_id);
   }
-  buf->Printf("\"libraryId\":%"Pd",", library_id);
+  buf->Printf("\"libraryId\":%" Pd ",", library_id);
   RETURN_IF_ERROR(static_fields);
   buf->Printf("\"fields\":");
   FormatNamedValueList(buf, static_fields);
   buf->Printf("}");
   return NULL;
 }
 
 
 static const char* FormatLibraryProps(dart::TextBuffer* buf,
                                       intptr_t lib_id) {
@@ skipping 43 matching lines @@
 
 static const char* FormatObjProps(dart::TextBuffer* buf,
                                   Dart_Handle object) {
   intptr_t class_id;
   if (Dart_IsNull(object)) {
     buf->Printf("{\"classId\":-1,\"fields\":[]}");
     return NULL;
   }
   Dart_Handle res = Dart_GetObjClassId(object, &class_id);
   RETURN_IF_ERROR(res);
-  buf->Printf("{\"classId\": %"Pd",", class_id);
+  buf->Printf("{\"classId\": %" Pd ",", class_id);
   buf->Printf("\"kind\":\"object\",\"fields\":");
   Dart_Handle fields = Dart_GetInstanceFields(object);
   RETURN_IF_ERROR(fields);
   FormatNamedValueList(buf, fields);
   buf->Printf("}");
   return NULL;
 }
 
 
 static const char* FormatListSlice(dart::TextBuffer* buf,
                                    Dart_Handle list,
                                    intptr_t list_length,
                                    intptr_t index,
                                    intptr_t slice_length) {
   intptr_t end_index = index + slice_length;
   ASSERT(end_index <= list_length);
-  buf->Printf("{\"index\":%"Pd",", index);
-  buf->Printf("\"length\":%"Pd",", slice_length);
+  buf->Printf("{\"index\":%" Pd ",", index);
+  buf->Printf("\"length\":%" Pd ",", slice_length);
   buf->Printf("\"elements\":[");
   for (intptr_t i = index; i < end_index; i++) {
     Dart_Handle value = Dart_ListGetAt(list, i);
     if (i > index) {
       buf->Printf(",");
     }
     FormatValueObj(buf, value);
   }
   buf->Printf("]}");
   return NULL;
@@ skipping 513 matching lines @@
   Dart_Handle bp_id = Dart_SetBreakpoint(url, line_number);
   if (Dart_IsError(bp_id)) {
     in_msg->SendErrorReply(msg_id, Dart_GetError(bp_id));
     return false;
   }
   ASSERT(Dart_IsInteger(bp_id));
   uint64_t bp_id_value;
   Dart_Handle res = Dart_IntegerToUint64(bp_id, &bp_id_value);
   ASSERT_NOT_ERROR(res);
   dart::TextBuffer msg(64);
-  msg.Printf("{ \"id\": %d, \"result\": { \"breakpointId\": %"Pu64" }}",
+  msg.Printf("{ \"id\": %d, \"result\": { \"breakpointId\": %" Pu64 " }}",
              msg_id, bp_id_value);
   in_msg->SendReply(&msg);
   return false;
 }
 
 
 bool DbgMessage::HandlePauseOnExcCmd(DbgMessage* in_msg) {
   ASSERT(in_msg != NULL);
   MessageParser msg_parser(in_msg->buffer(), in_msg->buffer_len());
   int msg_id = msg_parser.MessageId();
@@ skipping 102 matching lines @@
     DebuggerConnectionHandler::BroadcastMsg(&queued_output_messages_);
     queued_output_messages_.Clear();
   }
 }
 
 
 void DbgMsgQueue::SendBreakpointEvent(const Dart_CodeLocation& location) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
   msg.Printf("\"reason\": \"breakpoint\", ");
-  msg.Printf("\"isolateId\": %"Pd64"", isolate_id_);
+  msg.Printf("\"isolateId\": %" Pd64 "", isolate_id_);
   if (!Dart_IsNull(location.script_url)) {
     ASSERT(Dart_IsString(location.script_url));
     msg.Printf(",\"location\": { \"url\":");
     FormatEncodedString(&msg, location.script_url);
     msg.Printf(",\"libraryId\":%d,", location.library_id);
     msg.Printf("\"tokenOffset\":%d}", location.token_pos);
   }
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the paused event in the wire protocol.
 void DbgMsgQueue::SendExceptionEvent(Dart_Handle exception,
                                      Dart_StackTrace stack_trace) {
   intptr_t exception_id = Dart_CacheObject(exception);
   ASSERT(exception_id >= 0);
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": {");
   msg.Printf("\"reason\": \"exception\", ");
-  msg.Printf("\"isolateId\": %"Pd64", ", isolate_id_);
+  msg.Printf("\"isolateId\": %" Pd64 ", ", isolate_id_);
   msg.Printf("\"exception\":");
   FormatRemoteObj(&msg, exception);
   FormatLocationFromTrace(&msg, stack_trace, ", ");
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the interrupted event in the wire protocol.
 void DbgMsgQueue::SendIsolateEvent(Dart_IsolateId isolate_id,
                                    Dart_IsolateEvent kind) {
   dart::TextBuffer msg(128);
   if (kind == kInterrupted) {
     Dart_StackTrace trace;
     Dart_Handle res = Dart_GetStackTrace(&trace);
     ASSERT_NOT_ERROR(res);
     msg.Printf("{ \"event\": \"paused\", \"params\": { ");
     msg.Printf("\"reason\": \"interrupted\", ");
-    msg.Printf("\"isolateId\": %"Pd64"", isolate_id);
+    msg.Printf("\"isolateId\": %" Pd64 "", isolate_id);
     FormatLocationFromTrace(&msg, trace, ", ");
     msg.Printf("}}");
   } else {
     msg.Printf("{ \"event\": \"isolate\", \"params\": { ");
     if (kind == kCreated) {
       msg.Printf("\"reason\": \"created\", ");
     } else {
       ASSERT(kind == kShutdown);
       msg.Printf("\"reason\": \"shutdown\", ");
     }
-    msg.Printf("\"id\": %"Pd64" ", isolate_id);
+    msg.Printf("\"id\": %" Pd64 " ", isolate_id);
     msg.Printf("}}");
   }
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 DbgMsgQueue* DbgMsgQueueList::list_ = NULL;
 dart::Mutex* DbgMsgQueueList::msg_queue_list_lock_ = new dart::Mutex();
 
 
@@ skipping 104 matching lines @@
   UNREACHABLE();
 }
 
 
 void DbgMsgQueueList::ListIsolateIds(dart::TextBuffer* msg) {
   MutexLocker ml(msg_queue_list_lock_);
   if (list_ == NULL) {
     return;  // No items in the list.
   }
   DbgMsgQueue* queue = list_;
-  msg->Printf("%"Pd64"", queue->isolate_id());
+  msg->Printf("%" Pd64 "", queue->isolate_id());
   queue = queue->next();
   while (queue != NULL) {
-    msg->Printf(",%"Pd64"", queue->isolate_id());
+    msg->Printf(",%" Pd64 "", queue->isolate_id());
     queue = queue->next();
   }
 }
 
 
 void DbgMsgQueueList::BptResolvedHandler(Dart_IsolateId isolate_id,
                                          intptr_t bp_id,
                                          const Dart_CodeLocation& location) {
   Dart_EnterScope();
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"breakpointResolved\", \"params\": {");
-  msg.Printf("\"breakpointId\": %"Pd"", bp_id);
+  msg.Printf("\"breakpointId\": %" Pd "", bp_id);
 
-  msg.Printf(", \"isolateId\":%"Pd64"", isolate_id);
+  msg.Printf(", \"isolateId\":%" Pd64 "", isolate_id);
   ASSERT(!Dart_IsNull(location.script_url));
   ASSERT(Dart_IsString(location.script_url));
   msg.Printf(", \"location\":{\"url\":");
   FormatEncodedString(&msg, location.script_url);
   msg.Printf(",\"libraryId\":%d", location.library_id);
   msg.Printf(",\"tokenOffset\":%d}}}", location.token_pos);
 
   DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
   ASSERT(msg_queue != NULL);
   msg_queue->QueueOutputMsg(&msg);
@@ skipping 45 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart