Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5

--HG-- extra : convert_revision : 60b307d827220ba76b607d3f18d4fa00ab3fb1d5
2003-11-07 01:39:17 -05:00
parent c5da35e8d5 40820042f1
commit 22679d3da8
1 changed files with 4 additions and 0 deletions
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -272,6 +272,8 @@ Database::reset()
        ++i;
    }

+    MainBin *orig = MainBin::current();
+
    list<GenBin *>::iterator bi = bins.begin();
    list<GenBin *>::iterator be = bins.end();
    while (bi != be) {
@@ -286,6 +288,8 @@ Database::reset()
        }
        ++bi;
    }
+
+    orig->activate();
 }

 void