Changeset 2101Tweet

Timestamp:

Nov 21, 2012, 2:11:20 AM (9 years ago)

Author:

sam

Message:

core: do not use va_copy since Visual Studio doesn’t know about it.

Location:

trunk

Files:

• src/core/string.cpp (modified) (1 diff)
• test/unit/string.cpp (modified) (1 diff)

trunk/src/core/string.cpp

@@ -30 +30 @@
 {
     String ret;
-
-    va_list ap, aq;
-    va_start(ap, format);
-    va_copy(aq, ap);
+    va_list ap;
 
     /* vsnprintf() tells us how many character we need, and we need to
      * add one for the terminating null byte. */
-    size_t needed = vsnprintf(NULL, 0, format, aq) + 1;
+    va_start(ap, format);
+    size_t needed = vsnprintf(NULL, 0, format, ap) + 1;
+    va_end(ap);
+
     ((Super &)ret).Reserve(needed);
     ret.m_count = needed;
-    vsnprintf(&ret[0], needed, format, ap);
 
-    va_end(aq);
+    /* We don’t use va_copy because Visual Studio 2010 does not support it. */
+    va_start(ap, format);
+    std::vsnprintf(&ret[0], needed, format, ap);
     va_end(ap);
 

trunk/test/unit/string.cpp

@@ -128 +128 @@
 
         LOLUNIT_ASSERT(s1 == s2);
+
+        String s3 = "abc 3";
+        String s4 = String::Printf("abc %d", 3);
+
+        LOLUNIT_ASSERT(s3 == s4);
     }
 };