# # patch "ChangeLog" # from [e88570cabca28fcff018fba88cbced049e537bb9] # to [8b4d852dead6e549d0a3574cc8db1b00f2a61adb] # # patch "sanity.cc" # from [b6434a833c6f699fa01ab047a2f3a52ea679d1d8] # to [36ad241e17f12b3d4e08f78ba1f302bb76523a76] # =============================================== --- ChangeLog e88570cabca28fcff018fba88cbced049e537bb9 +++ ChangeLog 8b4d852dead6e549d0a3574cc8db1b00f2a61adb @@ -1,3 +1,8 @@ +2005-07-24 Nathaniel Smith + + * sanity.cc (MusingI, ~MusingI): No-op when already in the middle + of dumping. + 2005-07-25 Matthew Gregan * Makefile.am, configure.ac: Remove BUNDLED_{LUA,SQLITE} tests and =============================================== --- sanity.cc b6434a833c6f699fa01ab047a2f3a52ea679d1d8 +++ sanity.cc 36ad241e17f12b3d4e08f78ba1f302bb76523a76 @@ -282,13 +282,17 @@ MusingI::MusingI() { - global_sanity.musings.push_back(this); + if (!global_sanity.already_dumping) + global_sanity.musings.push_back(this); } MusingI::~MusingI() { - I(global_sanity.musings.back() == this); - global_sanity.musings.pop_back(); + if (!global_sanity.already_dumping) + { + I(global_sanity.musings.back() == this); + global_sanity.musings.pop_back(); + } } void