Changeset 34265 for lang/cplusplus

Timestamp:

07/03/09 13:37:11 (4 years ago)

Author:

kazuho

Message:

apply suppress warning patch on gcc 4.4 and vc 2005

Files:

• lang/cplusplus/picojson/trunk/picojson.h (modified) (8 diffs)

lang/cplusplus/picojson/trunk/picojson.h

@@ -38 +38 @@
 #include <string>
 #include <vector>
+
+#ifdef _MSC_VER
+    #define SNPRINTF _snprintf_s
+    #pragma warning(push)
+    #pragma warning(disable : 4244) // conversion from int to char
+#else
+    #define SNPRINTF snprintf
+#endif
 
 namespace picojson {
@@ -224 +232 @@
     case number_type:    {
       char buf[256];
-#if _MSC_VER >= 1400 // VC 2005
-      _snprintf_s(buf, sizeof(buf), "%f", number_);
-#else
-      snprintf(buf, sizeof(buf), "%f", number_);
-#endif
+      SNPRINTF(buf, sizeof(buf), "%f", number_);
       return buf;
     }
@@ -235 +239 @@
     case object_type:    return "object";
     default:             assert(0);
-#if _MSC_VER >= 1310 // VC 2003
+#ifdef _MSC_VER
       __assume(0);
 #endif
@@ -262 +266 @@
         if ((unsigned char)*i < 0x20 || *i == 0x7f) {
           char buf[7];
-          sprintf(buf, "\\u%04x", *i & 0xff);
+          SNPRINTF(buf, sizeof(buf), "\\u%04x", *i & 0xff);
           copy(buf, buf + 6, oi);
           } else {
@@ -518 +522 @@
     while (! in.eof()) {
       int ch = in.getc();
-      if ('0' <= ch && ch <= '9' || ch == '+' || ch == '-' || ch == '.'
+      if (('0' <= ch && ch <= '9') || ch == '+' || ch == '-' || ch == '.'
           || ch == 'e' || ch == 'E') {
         num_str.push_back(ch);
@@ -554 +558 @@
       if (ch != -1) {
         in.ungetc();
-        if ('0' <= ch && ch <= '9' || ch == '-') {
+        if (('0' <= ch && ch <= '9') || ch == '-') {
           return _parse_number(out, in);
         }
@@ -570 +574 @@
     if (! _parse(out, in)) {
       char buf[64];
-      sprintf(buf, "syntax error at line %d near: ", in.line());
+      SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
       err = buf;
       while (! in.eof()) {
@@ -619 +623 @@
   return os;
 }
+#ifdef _MSC_VER
+    #pragma warning(pop)
+#endif
 
 #endif
 #ifdef TEST_PICOJSON
+#ifdef _MSC_VER
+    #pragma warning(disable : 4127) // conditional expression is constant
+#endif
 
 using namespace std;