Merge pull request #458 from redboltz/fix_457

redboltz · redboltz · commit 068041f05eb1 · 2016-04-17T11:28:02.000+09:00
Fixed #457.
diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp
@@ -734,7 +734,7 @@ inline std::ostream& operator<< (std::ostream& s, const msgpack::object& o)
 {
     switch(o.type) {
     case msgpack::type::NIL:
-        s << "nil";
+        s << "null";
         break;
 
     case msgpack::type::BOOLEAN:

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ inline std::ostream& operator<< (std::ostream& s, const msgpack::object& o)`
`734`	`734`	`{`
`735`	`735`	`switch(o.type) {`
`736`	`736`	`case msgpack::type::NIL:`
`737`		`- s << "nil";`
	`737`	`+ s << "null";`
`738`	`738`	`break;`
`739`	`739`
`740`	`740`	`case msgpack::type::BOOLEAN:`