Merge changes to make m5 g++ 3.4 compatible.
authorKevin Lim <ktlim@umich.edu>
Tue, 18 Jan 2005 18:02:47 +0000 (13:02 -0500)
committerKevin Lim <ktlim@umich.edu>
Tue, 18 Jan 2005 18:02:47 +0000 (13:02 -0500)
commitaed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d
treef48c9d361d04cc6276ef33a9898eb0ac61de36d7
parent783f701247a1013a32d7caab324660c211215a11
parentf31a27a030d2e93fef2934aa8642609bb38974af
Merge changes to make m5 g++ 3.4 compatible.

sim/param.cc:
    Merge changes.

--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
base/trace.cc
dev/ns_gige.hh
sim/param.cc
sim/universe.cc