script_core 0.1.1 → 0.2.0

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

@@ -1,5 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
+
+#pragma GCC diagnostic pop
+
 #include <cmath>
 
 #ifdef HAVE_CONFIG_H
@@ -202,7 +209,7 @@ TEST(object_with_zone, vector)
         vector<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<vector<int> >() == v1);
@@ -282,7 +289,7 @@ TEST(object_with_zone, list)
         list<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<list<int> >() == v1);
@@ -298,7 +305,7 @@ TEST(object_with_zone, deque)
         deque<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<deque<int> >() == v1);
@@ -332,6 +339,17 @@ TEST(object_without_zone, string)
 
 #endif // MSGPACK_DEFAULT_API_VERSION == 1
 
+// wstring
+TEST(object_with_zone, wstring)
+{
+    wstring v = L"abc";
+    msgpack::zone z;
+    msgpack::object obj(v, z);
+    EXPECT_EQ(obj.as<wstring>(), v);
+    v[0] = 'd';
+    EXPECT_EQ(obj.as<wstring>()[0], L'a');
+}
+
 // char*
 TEST(object_with_zone, char_ptr)
 {
@@ -401,7 +419,7 @@ TEST(object_with_zone, set)
     for (unsigned int k = 0; k < kLoop; k++) {
         set<int> v1;
         for (unsigned int i = 0; i < kElements; i++)
-            v1.insert(i);
+            v1.insert(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<set<int> >() == v1);
@@ -861,7 +879,7 @@ TEST(object_with_zone, array_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<char>(rand());
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<test_t>() == v1);
@@ -877,7 +895,7 @@ TEST(object_without_zone, array_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<char>(rand());
         msgpack::object obj(v1);
         EXPECT_TRUE(obj.as<test_t>() == v1);
         v1.front() = 42;
@@ -894,7 +912,7 @@ TEST(object_with_zone, array_unsigned_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<unsigned char>(rand());
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<test_t>() == v1);
@@ -911,7 +929,7 @@ TEST(object_without_zone, array_unsigned_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<unsigned char>(rand());
         msgpack::object obj(v1);
         EXPECT_TRUE(obj.as<test_t>() == v1);
         v1.front() = 42;
@@ -926,7 +944,7 @@ TEST(object_with_zone, forward_list)
     for (unsigned int k = 0; k < kLoop; k++) {
         forward_list<int> v1;
         for (unsigned int i = 0; i < kElements; i++)
-            v1.push_front(i);
+            v1.push_front(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<forward_list<int> >() == v1);
@@ -1031,7 +1049,7 @@ TEST(object_with_zone, ext_empty)
 TEST(object_with_zone, ext)
 {
     msgpack::type::ext v(42, 10);
-    for (int i = 0; i < 10; ++i) v.data()[i] = i;
+    for (int i = 0; i < 10; ++i) v.data()[i] = static_cast<char>(i);
     msgpack::zone z;
     msgpack::object obj(v, z);
     EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);

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

@@ -1,5 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
+
+#pragma GCC diagnostic pop
+
 #include <sstream>
 
 TEST(pack, num)
@@ -517,7 +524,7 @@ TEST(unpack, int_off_larger_than_length)
 TEST(unpack, empty_array_fix)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0x90));
+    buf.push_back(static_cast<char>(0x90));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -529,9 +536,9 @@ TEST(unpack, empty_array_fix)
 TEST(unpack, empty_array_16)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0xdc));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
+    buf.push_back(static_cast<char>(0xdc));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -543,11 +550,11 @@ TEST(unpack, empty_array_16)
 TEST(unpack, empty_array_32)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0xdd));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
+    buf.push_back(static_cast<char>(0xdd));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -559,7 +566,7 @@ TEST(unpack, empty_array_32)
 TEST(unpack, empty_map_fix)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0x80));
+    buf.push_back(static_cast<char>(0x80));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -571,9 +578,9 @@ TEST(unpack, empty_map_fix)
 TEST(unpack, empty_map_16)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0xde));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
+    buf.push_back(static_cast<char>(0xde));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -585,11 +592,11 @@ TEST(unpack, empty_map_16)
 TEST(unpack, empty_map_32)
 {
     std::string buf;
-    buf.push_back(static_cast<unsigned char>(0xdf));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
-    buf.push_back(static_cast<unsigned char>(0x00));
+    buf.push_back(static_cast<char>(0xdf));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
+    buf.push_back(static_cast<char>(0x00));
     std::size_t off = 0;
 
     msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);

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

@@ -1,5 +1,12 @@
 #include <msgpack.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
+
+#pragma GCC diagnostic pop
+
 #include <stdio.h>
 
 TEST(pack, num)

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

@@ -3,8 +3,13 @@
 #include <string>
 #include <sstream>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -13,7 +18,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack)
 {
     std::string s = "ABC";
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -33,7 +38,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_8_l)
 {
     std::string s;
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -50,7 +55,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_8_h)
 {
     std::string s(0xff, 'A');
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -68,7 +73,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_16_l)
 {
     std::string s(0xff+1, 'A');
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -87,7 +92,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_16_h)
 {
     std::string s(0xffff, 'A');
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -106,7 +111,7 @@ TEST(MSGPACK_RAW_REF, pack_unpack_32_l)
 {
     std::string s(0xffff+1, 'A');
 
-    msgpack::type::raw_ref rr1(s.data(), s.size());
+    msgpack::type::raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -127,7 +132,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack)
 {
     std::string s = "ABC";
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -146,7 +151,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_l)
 {
     std::string s;
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -162,7 +167,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_fix_h)
 {
     std::string s(0x1f, 'A');
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -179,7 +184,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_16_l)
 {
     std::string s(0x1f+1, 'A');
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -198,7 +203,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_16_h)
 {
     std::string s(0xffff, 'A');
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();
@@ -217,7 +222,7 @@ TEST(MSGPACK_V4RAW_REF, pack_unpack_32_l)
 {
     std::string s(0xffff+1, 'A');
 
-    msgpack::type::v4raw_ref rr1(s.data(), s.size());
+    msgpack::type::v4raw_ref rr1(s.data(), static_cast<uint32_t>(s.size()));
     std::stringstream ss;
     msgpack::pack(ss, rr1);
     std::string packed_str = ss.str();

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

@@ -1,6 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 TEST(reference, unpack_int)
 {
     msgpack::sbuffer sbuf;

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

@@ -1,6 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 #if !defined(MSGPACK_USE_CPP03)
 
 TEST(reference, unpack_int)

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

@@ -1,7 +1,13 @@
 #include <msgpack.hpp>
 #include <sstream>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

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

@@ -1,8 +1,14 @@
 #include <msgpack.hpp>
 #include <sstream>
 #include <iterator>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

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

@@ -1,7 +1,13 @@
 #include <sstream>
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 TEST(size_equal_only, array)
 {
     std::stringstream ss;
@@ -186,7 +192,6 @@ TEST(size_equal_only, tuple)
 }
 
 struct foo1 {
-    foo1() = default;
     foo1(int i, bool b):t(i, b), seo(t) {}
     std::tuple<int, bool> t;
     msgpack::type::size_equal_only<std::tuple<int, bool> > seo;
@@ -194,7 +199,6 @@ struct foo1 {
 };
 
 struct foo2 {
-    foo2() = default;
     foo2(int i, bool b, std::string const& s):t(i, b, s), seo(t) {}
     std::tuple<int, bool, std::string> t;
     msgpack::type::size_equal_only<std::tuple<int, bool, std::string> > seo;

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

@@ -1,5 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
+
+#pragma GCC diagnostic pop
+
 #include <sstream>
 
 TEST(streaming, basic)
@@ -168,7 +175,7 @@ public:
         while(true) {
             pac.reserve_buffer(32*1024);
 
-            size_t len = static_cast<size_t>(input.readsome(pac.buffer(), pac.buffer_capacity()));
+            size_t len = static_cast<size_t>(input.readsome(pac.buffer(), static_cast<std::streamsize>(pac.buffer_capacity())));
 
             if(len == 0) {
                 return;
@@ -240,7 +247,7 @@ TEST(streaming, basic_compat)
     while(count < 3) {
         pac.reserve_buffer(32*1024);
 
-        size_t len = static_cast<size_t>(input.readsome(pac.buffer(), pac.buffer_capacity()));
+        size_t len = static_cast<size_t>(input.readsome(pac.buffer(), static_cast<std::streamsize>(pac.buffer_capacity())));
         pac.buffer_consumed(len);
 
         while(pac.execute()) {
@@ -276,7 +283,7 @@ public:
         while(true) {
             pac.reserve_buffer(32*1024);
 
-            size_t len = static_cast<size_t>(input.readsome(pac.buffer(), pac.buffer_capacity()));
+            size_t len = static_cast<size_t>(input.readsome(pac.buffer(), static_cast<std::streamsize>(pac.buffer_capacity())));
 
             if(len == 0) {
                 return;