use c++11, use unique_ptr in GameSave::SerializeOPS

The-Powder-Toy · Dec 27, 2017 · 887d606 · 887d606
1 parent 23c68b1
commit 887d606
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 152 deletions.
diff --git a/SConscript b/SConscript
@@ -396,10 +396,7 @@ elif not GetOption('help'):
 	env = conf.Finish()
 
 if not msvc:
-	if platform == "Windows":
-		env.Append(CXXFLAGS=['-std=gnu++98'])
-	else:
-		env.Append(CXXFLAGS=['-std=c++98'])
+	env.Append(CXXFLAGS=['-std=c++11'])
 	env.Append(CXXFLAGS=['-Wno-invalid-offsetof'])
 	if platform == "Linux":
 		env.Append(CXXFLAGS=['-Wno-unused-result'])

diff --git a/src/bson/BSON.cpp b/src/bson/BSON.cpp
@@ -664,7 +664,8 @@ int bson_finish( bson *b ) {
 }
 
 void bson_destroy( bson *b ) {
-	bson_free( b->data );
+	if (b->data)
+		bson_free( b->data );
 	b->err = 0;
 	b->data = 0;
 	b->cur = 0;