Merge pull request #502 from open-source-parsers/null-object

cdunn2001 · web-flow · commit b14c8c142337 · 2016-07-20T22:28:44.000-07:00
Allow dtor for nullSingleton
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -39,8 +39,8 @@ namespace Json {
 // static
 Value const& Value::nullSingleton()
 {
- static Value const* nullStatic = new Value;
- return *nullStatic;
+ static Value const nullStatic;
+ return nullStatic;
 }
 
 // for backwards compatibility, we'll leave these global references around, but DO NOT

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ namespace Json {`
`39`	`39`	`// static`
`40`	`40`	`Value const& Value::nullSingleton()`
`41`	`41`	`{`
`42`		`- static Value const* nullStatic = new Value;`
`43`		`- return *nullStatic;`
	`42`	`+ static Value const nullStatic;`
	`43`	`+ return nullStatic;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// for backwards compatibility, we'll leave these global references around, but DO NOT`