script_core 0.2.5 → 0.3.2

data/ext/enterprise_script_service/msgpack/test/msgpack_cpp11.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -883,7 +887,7 @@ TEST(MSGPACK_CHRONO, system_clock_32)
     msgpack::sbuffer sbuf;
     msgpack::pack(sbuf, val1);
     char packed[] = {
-        static_cast<char>(0xd6),
+        static_cast<char>(0xd6u),
         static_cast<char>(-1),
         static_cast<char>(0x12),
         static_cast<char>(0x34),
@@ -908,12 +912,12 @@ TEST(MSGPACK_CHRONO, system_clock_32_max)
     msgpack::sbuffer sbuf;
     msgpack::pack(sbuf, val1);
     char packed[] = {
-        static_cast<char>(0xd6),
+        static_cast<char>(0xd6u),
         static_cast<char>(-1),
-        static_cast<char>(0xff),
-        static_cast<char>(0xff),
-        static_cast<char>(0xff),
-        static_cast<char>(0xff)
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu)
     };
     EXPECT_EQ(memcmp(sbuf.data(), packed, sizeof(packed)), 0);
 
@@ -959,28 +963,28 @@ TEST(MSGPACK_CHRONO, system_clock_64_max)
     msgpack::sbuffer sbuf;
     msgpack::pack(sbuf, val1);
     char packed_nano[] = {
-        static_cast<char>(0xd7),
+        static_cast<char>(0xd7u),
         static_cast<char>(-1),
-        static_cast<char>(0xee), // 999,999,999 << 2
+        static_cast<char>(0xeeu), // 999,999,999 << 2
         static_cast<char>(0x6b),
         static_cast<char>(0x27),
-        static_cast<char>(0xfc),
-        static_cast<char>(0xff), // 32 bit sec
-        static_cast<char>(0xff),
-        static_cast<char>(0xff),
-        static_cast<char>(0xff)
+        static_cast<char>(0xfcu),
+        static_cast<char>(0xffu), // 32 bit sec
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu)
     };
     char packed_micro[] = {
-        static_cast<char>(0xd7),
+        static_cast<char>(0xd7u),
         static_cast<char>(-1),
-        static_cast<char>(0xee), // 999,999,000 << 2
+        static_cast<char>(0xeeu), // 999,999,000 << 2
         static_cast<char>(0x6b),
         static_cast<char>(0x18),
         static_cast<char>(0x60),
-        static_cast<char>(0xff), // 32 bit sec
-        static_cast<char>(0xff),
-        static_cast<char>(0xff),
-        static_cast<char>(0xff)
+        static_cast<char>(0xffu), // 32 bit sec
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu),
+        static_cast<char>(0xffu)
     };
     if (std::chrono::system_clock::duration::period::ratio::den == 1000000000) {
         EXPECT_EQ(memcmp(sbuf.data(), packed_nano, sizeof(packed_nano)), 0);
@@ -1056,7 +1060,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_zero)
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xd6));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xd6u));
 
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());
@@ -1078,11 +1082,11 @@ TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_zero)
 TEST(MSGPACK_TIMESPEC, timespec_pack_convert_32bit_sec)
 {
     std::stringstream ss;
-    timespec val1{ 0xffffffffUL, 0 };
+    timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::is_signed ? INT32_MAX : UINT32_MAX, 0 };
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xd6));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xd6u));
 
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());
@@ -1094,7 +1098,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_32bit_sec)
 TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_32bit_sec)
 {
     msgpack::zone z;
-    timespec val1{ 0xffffffffUL, 0 };
+    timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::is_signed ? INT32_MAX : UINT32_MAX, 0 };
     msgpack::object obj(val1, z);
     timespec val2 = obj.as<timespec>();
     EXPECT_EQ(val1.tv_sec, val2.tv_sec);
@@ -1108,7 +1112,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_max_nano)
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xd7));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xd7u));
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());
     timespec val2 = oh.get().as<timespec>();
@@ -1134,7 +1138,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_34bit_sec_max_nano)
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xd7));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xd7u));
 
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());
@@ -1162,7 +1166,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_35bit_sec_max_nano)
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xc7));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xc7u));
 
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());
@@ -1184,12 +1188,13 @@ TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_35bit_sec_max_nano)
 
 TEST(MSGPACK_TIMESPEC, timespec_pack_convert_64bit_sec_max_nano)
 {
+    if (sizeof(decltype(std::declval<timespec>().tv_sec)) <= 4) return;
     std::stringstream ss;
     timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::max(), 999999999 };
 
     msgpack::pack(ss, val1);
     std::string const& str = ss.str();
-    EXPECT_EQ(str.data()[0], static_cast<char>(0xc7));
+    EXPECT_EQ(str.data()[0], static_cast<char>(0xc7u));
 
     msgpack::object_handle oh;
     msgpack::unpack(oh, str.data(), str.size());

data/ext/enterprise_script_service/msgpack/test/msgpack_cpp17.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/msgpack_stream.cpp

@@ -9,12 +9,16 @@
 #include <list>
 #include <limits>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/msgpack_tuple.cpp

@@ -1,12 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
-
+#endif //defined(__GNUC__)
 
 TEST(msgpack_tuple, member_get)
 {

data/ext/enterprise_script_service/msgpack/test/msgpack_vref.cpp

@@ -9,12 +9,16 @@
 #include <list>
 #include <limits>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/msgpack_x3_parse.cpp

@@ -4,12 +4,16 @@
 #include <limits>
 #include <cmath>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 // To avoid link error
 TEST(MSGPACK_X3_PARSE, dummy)

data/ext/enterprise_script_service/msgpack/test/object.cpp

@@ -1,12 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
-
+#endif //defined(__GNUC__)
 
 enum enum_test {
     elem

data/ext/enterprise_script_service/msgpack/test/object_with_zone.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <cmath>
 
@@ -769,14 +773,14 @@ TEST(object_with_zone, user_defined_non_virtual)
 
     msgpack::zone z;
     msgpack::object obj(b, z);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
     bottom br = obj.as<bottom>();
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
     EXPECT_EQ(b.b, br.b);
     EXPECT_EQ(b.m1, br.m1);
     EXPECT_EQ(b.m2, br.m2);
@@ -814,14 +818,14 @@ TEST(object_with_zone, user_defined_virtual)
 
     msgpack::zone z;
     msgpack::object obj(b, z);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
     v_bottom br = obj.as<v_bottom>();
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
     EXPECT_EQ(b.b, br.b);
     EXPECT_EQ(b.m1, br.m1);
     EXPECT_EQ(b.m2, br.m2);

data/ext/enterprise_script_service/msgpack/test/pack_unpack.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <sstream>
 
@@ -163,14 +167,14 @@ TEST(unpack, int_pointer_off_no_ref)
     std::size_t off = 0;
 
     // obsolete
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     EXPECT_EQ(1, oh.get().as<int>());
     EXPECT_EQ(off, sbuf.size());
 }
@@ -184,14 +188,14 @@ TEST(unpack, int_pointer_off_no_ref_explicit)
     std::size_t off = 0;
 
     // obsolete
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, MSGPACK_NULLPTR);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     EXPECT_EQ(1, oh.get().as<int>());
     EXPECT_EQ(off, sbuf.size());
 }
@@ -204,14 +208,14 @@ TEST(unpack, int_pointer_no_off_ref)
     bool referenced;
 
     // obsolete
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), MSGPACK_NULLPTR, &referenced);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     EXPECT_EQ(1, oh.get().as<int>());
     EXPECT_FALSE(referenced);
 }
@@ -225,14 +229,14 @@ TEST(unpack, int_pointer_off_ref)
     std::size_t off = 0;
 
     // obsolete
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, &referenced);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     EXPECT_EQ(1, oh.get().as<int>());
     EXPECT_EQ(off, sbuf.size());
     EXPECT_FALSE(referenced);
@@ -246,14 +250,14 @@ TEST(unpack, int_default_null_pointer)
     msgpack::object_handle oh;
 
     // obsolete
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     msgpack::unpack(&oh, sbuf.data(), sbuf.size());
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
     EXPECT_EQ(1, oh.get().as<int>());
 }
 
@@ -524,7 +528,7 @@ TEST(unpack, int_off_larger_than_length)
 TEST(unpack, empty_array_fix)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0x90));
+    buf.push_back(static_cast<char>(0x90u));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -536,7 +540,7 @@ TEST(unpack, empty_array_fix)
 TEST(unpack, empty_array_16)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0xdc));
+    buf.push_back(static_cast<char>(0xdcu));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
@@ -550,7 +554,7 @@ TEST(unpack, empty_array_16)
 TEST(unpack, empty_array_32)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0xdd));
+    buf.push_back(static_cast<char>(0xddu));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));
@@ -566,7 +570,7 @@ TEST(unpack, empty_array_32)
 TEST(unpack, empty_map_fix)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0x80));
+    buf.push_back(static_cast<char>(0x80u));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -578,7 +582,7 @@ TEST(unpack, empty_map_fix)
 TEST(unpack, empty_map_16)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0xde));
+    buf.push_back(static_cast<char>(0xdeu));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
@@ -592,7 +596,7 @@ TEST(unpack, empty_map_16)
 TEST(unpack, empty_map_32)
 {
     std::string buf;
-    buf.push_back(static_cast<char>(0xdf));
+    buf.push_back(static_cast<char>(0xdfu));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));
     buf.push_back(static_cast<char>(0x00));

data/ext/enterprise_script_service/msgpack/test/pack_unpack_c.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <stdio.h>
 

data/ext/enterprise_script_service/msgpack/test/raw.cpp

@@ -3,12 +3,16 @@
 #include <string>
 #include <sstream>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/reference.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 TEST(reference, unpack_int)
 {

data/ext/enterprise_script_service/msgpack/test/reference_cpp11.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #if !defined(MSGPACK_USE_CPP03)
 

data/ext/enterprise_script_service/msgpack/test/reference_wrapper_cpp11.cpp

@@ -1,12 +1,16 @@
 #include <msgpack.hpp>
 #include <sstream>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/shared_ptr_cpp11.cpp

@@ -2,12 +2,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/size_equal_only.cpp

@@ -1,12 +1,16 @@
 #include <sstream>
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 TEST(size_equal_only, array)
 {

data/ext/enterprise_script_service/msgpack/test/streaming.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.hpp>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <sstream>
 
@@ -85,14 +89,14 @@ TEST(streaming, basic_pointer)
 
         pac.buffer_consumed(len);
 
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
         while(pac.next(&oh)) {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
             msgpack::object obj = oh.get();
             switch(count++) {
             case 0:

data/ext/enterprise_script_service/msgpack/test/streaming_c.cpp

@@ -1,11 +1,15 @@
 #include <msgpack.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <stdio.h>
 

data/ext/enterprise_script_service/msgpack/test/unique_ptr_cpp11.cpp

@@ -2,12 +2,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"