changeset 8647eb4489b8 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=8647eb4489b8
description:
        ext: Bump DRAMPower to avoid compilation issues

        This patch bumps DRAMPower to commit
        19433a6897ede4bbb19b06694faa8589b5a6569a which contains a small fix
        for clang, and a work-around for LTO with gcc 4.6.

diffstat:

 ext/drampower/src/MemCommand.h |  1 +
 ext/drampower/src/Utils.h      |  3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 99d59caa4c8f -r 8647eb4489b8 ext/drampower/src/MemCommand.h
--- a/ext/drampower/src/MemCommand.h    Mon Oct 20 18:03:52 2014 -0400
+++ b/ext/drampower/src/MemCommand.h    Mon Oct 20 18:03:53 2014 -0400
@@ -159,6 +159,7 @@
       }
     }
     assert(false); // Unknown name.
+    return NOP;  // For clang compilation
   }
 
  private:
diff -r 99d59caa4c8f -r 8647eb4489b8 ext/drampower/src/Utils.h
--- a/ext/drampower/src/Utils.h Mon Oct 20 18:03:52 2014 -0400
+++ b/ext/drampower/src/Utils.h Mon Oct 20 18:03:53 2014 -0400
@@ -54,8 +54,7 @@
   T t;
 
   if (!(is >> f >> t)) {
-    throw std::runtime_error("Cannot convert '" + s + "' to " +
-                             typeid(t).name() + " using fromString");
+    throw std::runtime_error("fromString cannot convert " + s);
   }
 
   return t;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to