From c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 Mon Sep 17 00:00:00 2001 From: Kevin Lim Date: Fri, 11 Feb 2005 17:54:33 -0500 Subject: Fix up #defines to use full path; fix up code for g++ 3.4 SConscript: Remove efence option from automatically being used. --HG-- extra : convert_revision : 466bb8077aa341db0b409720e2a73535b1fa6b69 --- cpu/beta_cpu/alpha_full_cpu.hh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cpu/beta_cpu/alpha_full_cpu.hh') diff --git a/cpu/beta_cpu/alpha_full_cpu.hh b/cpu/beta_cpu/alpha_full_cpu.hh index e01eba3bf..92eebc82a 100644 --- a/cpu/beta_cpu/alpha_full_cpu.hh +++ b/cpu/beta_cpu/alpha_full_cpu.hh @@ -3,16 +3,12 @@ // Read and write are horribly hacked up between not being sure where to // copy their code from, and Ron's memory changes. -#ifndef __ALPHA_FULL_CPU_HH__ -#define __ALPHA_FULL_CPU_HH__ +#ifndef __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ +#define __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ // To include: comm, full cpu, ITB/DTB if full sys, -//#include "cpu/beta_cpu/comm.hh" -//#include "cpu/beta_cpu/alpha_impl.hh" #include "cpu/beta_cpu/full_cpu.hh" -using namespace std; - template class AlphaFullCPU : public FullBetaCPU { @@ -250,4 +246,4 @@ class AlphaFullCPU : public FullBetaCPU }; -#endif // __ALPHA_FULL_CPU_HH__ +#endif // __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ -- cgit v1.2.3