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/libruby_internal.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/libruby_internal.hh')
-rw-r--r-- | src/mem/ruby/libruby_internal.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mem/ruby/libruby_internal.hh b/src/mem/ruby/libruby_internal.hh index 9e821ba7c..c64814051 100644 --- a/src/mem/ruby/libruby_internal.hh +++ b/src/mem/ruby/libruby_internal.hh @@ -26,16 +26,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LIBRUBY_INTERNAL_H -#define LIBRUBY_INTERNAL_H - -#include "mem/ruby/libruby.hh" +#ifndef __MEM_RUBY_LIBRUBY_INTERNAL_HH__ +#define __MEM_RUBY_LIBRUBY_INTERNAL_HH__ #include <ostream> #include <string> +#include "mem/ruby/libruby.hh" + std::string RubyRequestType_to_string(const RubyRequestType& obj); RubyRequestType string_to_RubyRequestType(std::string); std::ostream& operator<<(std::ostream& out, const RubyRequestType& obj); -#endif +#endif // __MEM_RUBY_LIBRUBY_INTERNAL_HH__ |