Permalink
Browse files

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

  • Loading branch information...
jacob1 committed Dec 27, 2017
1 parent 23c68b1 commit 887d60628d02354d40283f2b1e98212c5803270e
Showing with 151 additions and 152 deletions.
  1. +1 −4 SConscript
  2. +2 −1 src/bson/BSON.cpp
  3. +135 −145 src/client/GameSave.cpp
  4. +11 −0 src/client/GameSave.h
  5. +1 −1 src/gui/game/GameController.cpp
  6. +1 −1 src/gui/save/LocalSaveActivity.cpp
@@ -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'])
@@ -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;
Oops, something went wrong.

0 comments on commit 887d606

Please sign in to comment.