diff options
| author | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
| commit | d484e1b334c6fd3f2721a2a4628c2324ed14fd08 (patch) | |
| tree | c95594df5ecae29b11262967f3f8b99fca82ca5d /src/mem/ruby/system/NodeID.hh | |
| parent | 70308bc835035b940efb36d7f335643dfaa39851 (diff) | |
| parent | a0651b8f6127c8b7994a165b525e93d87c470d20 (diff) | |
| download | gem5-d484e1b334c6fd3f2721a2a4628c2324ed14fd08.tar.xz | |
m5merge(2): another merge of regression stats
Diffstat (limited to 'src/mem/ruby/system/NodeID.hh')
| -rw-r--r-- | src/mem/ruby/system/NodeID.hh | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/mem/ruby/system/NodeID.hh b/src/mem/ruby/system/NodeID.hh index 6191ad489..4ce8d8a8d 100644 --- a/src/mem/ruby/system/NodeID.hh +++ b/src/mem/ruby/system/NodeID.hh @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood * All rights reserved. @@ -27,26 +26,20 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * NodeID.hh - * - * Description: - * - * $Id: NodeID.hh,v 3.3 2003/12/04 15:01:39 xu Exp $ - * - */ - -#ifndef NODEID_H -#define NODEID_H +#ifndef __MEM_RUBY_SYSTEM_NODEID_HH__ +#define __MEM_RUBY_SYSTEM_NODEID_HH__ #include <string> -#include "mem/ruby/common/Global.hh" #include "mem/gems_common/util.hh" +#include "mem/ruby/common/Global.hh" typedef int NodeID; -extern inline -std::string NodeIDToString (NodeID node) { return int_to_string(node); } +inline std::string +NodeIDToString(NodeID node) +{ + return int_to_string(node); +} -#endif //NODEID_H +#endif // __MEM_RUBY_SYSTEM_NODEID_HH__ |