diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-07-06 15:49:47 -0700 |
| commit | a7904e2cf341d5452c5622adfcbdcd268d4ab7d1 (patch) | |
| tree | 76c744e731c275b393130b869c2c2944807a77af /src/mem/gems_common | |
| parent | 5b080ae0463c9644eb81bd923e25139dfe787e6e (diff) | |
| download | gem5-a7904e2cf341d5452c5622adfcbdcd268d4ab7d1.tar.xz | |
ruby: apply some fixes that were overwritten by the recent ruby import.
Diffstat (limited to 'src/mem/gems_common')
| -rw-r--r-- | src/mem/gems_common/std-includes.hh | 2 | ||||
| -rw-r--r-- | src/mem/gems_common/util.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mem/gems_common/std-includes.hh b/src/mem/gems_common/std-includes.hh index d6062337f..0c5201d34 100644 --- a/src/mem/gems_common/std-includes.hh +++ b/src/mem/gems_common/std-includes.hh @@ -52,4 +52,6 @@ using namespace std; using namespace __gnu_cxx; +typedef unsigned int uint; + #endif //INCLUDES_H diff --git a/src/mem/gems_common/util.cc b/src/mem/gems_common/util.cc index 403be383f..d2ca8cb96 100644 --- a/src/mem/gems_common/util.cc +++ b/src/mem/gems_common/util.cc @@ -30,7 +30,8 @@ * $Id$ */ -#include "assert.hh" +#include <cassert> + #include "mem/gems_common/util.hh" // Split a string into a head and tail strings on the specified @@ -101,6 +102,8 @@ bool string_to_bool(const string & str) return false; else assert(0); + + return false; } // Log functions |