aboutsummaryrefslogtreecommitdiffstats
path: root/include/json.h
diff options
context:
space:
mode:
authoripknHama <ipknhama@gmail.com>2015-02-20 10:54:32 +0900
committeripknHama <ipknhama@gmail.com>2015-02-20 10:54:32 +0900
commitf1d1fd6480facb5d20fea401bb2695b3573b6f02 (patch)
tree0de906eda2ad79c91b595af0d626743280c61f06 /include/json.h
parent7fe8e2cfdc7aeac9565abb6ee4904f31df99945f (diff)
downloadcrow-f1d1fd6480facb5d20fea401bb2695b3573b6f02.tar.gz
crow-f1d1fd6480facb5d20fea401bb2695b3573b6f02.zip
change 0b literals to 0x for VS2013 support
Diffstat (limited to 'include/json.h')
-rw-r--r--include/json.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/json.h b/include/json.h
index 2ade280..f647da5 100644
--- a/include/json.h
+++ b/include/json.h
@@ -252,7 +252,7 @@ namespace crow
explicit operator int() const
{
- return i();
+ return (int)i();
}
type t() const
@@ -330,14 +330,14 @@ namespace crow
from_hex(head[4]);
if (code >= 0x800)
{
- *tail++ = 0b11100000 | (code >> 12);
- *tail++ = 0b10000000 | ((code >> 6) & 0b111111);
- *tail++ = 0b10000000 | (code & 0b111111);
+ *tail++ = 0xE0 | (code >> 12);
+ *tail++ = 0x80 | ((code >> 6) & 0x3F);
+ *tail++ = 0x80 | (code & 0x3F);
}
else if (code >= 0x80)
{
- *tail++ = 0b11000000 | (code >> 6);
- *tail++ = 0b10000000 | (code & 0b111111);
+ *tail++ = 0xC0 | (code >> 6);
+ *tail++ = 0x80 | (code & 0x3F);
}
else
{