While I'm waiting for legion to run make m5 compile with a few more compilers

SConstruct:
src/SConscript:
    Add flags for Intel CC while i'm at it
src/base/compiler.hh:
    the _Pragma stuff needst to be called this way unless someone happens to have a cleaner way
src/base/cprintf_formats.hh:
    add std:: where appropriate
src/base/statistics.hh:
    use this->map since icc was getting confused about std::map vs the locally defined map
src/cpu/static_inst.hh:
    Add some more dummy returns where needed
src/mem/packet.hh:
    add more dummy returns where needed
src/sim/host.hh:
    use limits to come up with max tick

--HG--
extra : convert_revision : 08e9f7898b29fb9d063136529afb9b6abceab60c

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 19251941f..15f605ca7 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -41,10 +41,12 @@
 #include <cassert>
 #include <list>
 
+#include "base/misc.hh"
 #include "mem/request.hh"
 #include "sim/host.hh"
 #include "sim/root.hh"
 
+
 struct Packet;
 typedef Packet *PacketPtr;
 typedef uint8_t* PacketDataPtr;
@@ -238,7 +240,7 @@ class Packet
     bool isNoAllocate() const   { return (flags & NO_ALLOCATE) != 0; }
     bool isCompressed() const   { return (flags & COMPRESSED) != 0; }
 
-    bool nic_pkt() { assert("Unimplemented\n" && 0); return false; }
+    bool nic_pkt() { panic("Unimplemented"); M5_DUMMY_RETURN }
 
     /** Possible results of a packet's request. */
     enum Result