generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-03-06 13:41:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1191 from Sumoren/msc_long

Browse Source 
Support long and unsined long as int and unsigned on Microsft platforms
This commit is contained in:
Milo Yip 2018-03-09 11:33:12 +08:00 committed by GitHub
commit 3b638e6715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/rapidjson/document.h
View File

@ -451,6 +451,26 @@ struct TypeHelper<ValueType, unsigned> {
static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); } static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
}; };
#ifdef _MSC_VER
RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
template<typename ValueType>
struct TypeHelper<ValueType, long> {
static bool Is(const ValueType& v) { return v.IsInt(); }
static long Get(const ValueType& v) { return v.GetInt(); }
static ValueType& Set(ValueType& v, long data) { return v.SetInt(data); }
static ValueType& Set(ValueType& v, long data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
};
RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
template<typename ValueType>
struct TypeHelper<ValueType, unsigned long> {
static bool Is(const ValueType& v) { return v.IsUint(); }
static unsigned long Get(const ValueType& v) { return v.GetUint(); }
static ValueType& Set(ValueType& v, unsigned long data) { return v.SetUint(data); }
static ValueType& Set(ValueType& v, unsigned long data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
};
#endif
template<typename ValueType> template<typename ValueType>
struct TypeHelper<ValueType, int64_t> { struct TypeHelper<ValueType, int64_t> {
static bool Is(const ValueType& v) { return v.IsInt64(); } static bool Is(const ValueType& v) { return v.IsInt64(); }

16
test/unittest/valuetest.cpp
View File

@ -439,6 +439,14 @@ TEST(Value, Int) {
EXPECT_EQ(5678, z.Get<int>()); EXPECT_EQ(5678, z.Get<int>());
EXPECT_EQ(5679, z.Set(5679).Get<int>()); EXPECT_EQ(5679, z.Set(5679).Get<int>());
EXPECT_EQ(5680, z.Set<int>(5680).Get<int>()); EXPECT_EQ(5680, z.Set<int>(5680).Get<int>());
#ifdef _MSC_VER
// long as int on MSC platforms
RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
z.SetInt(1234);
EXPECT_TRUE(z.Is<long>());
EXPECT_EQ(1234l, z.Get<long>());
#endif
} }
TEST(Value, Uint) { TEST(Value, Uint) {
@ -485,6 +493,14 @@ TEST(Value, Uint) {
EXPECT_EQ(2147483648u, z.Get<unsigned>()); EXPECT_EQ(2147483648u, z.Get<unsigned>());
EXPECT_EQ(2147483649u, z.Set(2147483649u).Get<unsigned>()); EXPECT_EQ(2147483649u, z.Set(2147483649u).Get<unsigned>());
EXPECT_EQ(2147483650u, z.Set<unsigned>(2147483650u).Get<unsigned>()); EXPECT_EQ(2147483650u, z.Set<unsigned>(2147483650u).Get<unsigned>());
#ifdef _MSC_VER
// unsigned long as unsigned on MSC platforms
RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
z.SetUint(1234);
EXPECT_TRUE(z.Is<unsigned long>());
EXPECT_EQ(1234ul, z.Get<unsigned long>());
#endif
} }
TEST(Value, Int64) { TEST(Value, Int64) {