Fix a bunch of bugs I introduced when I changed the flags stuff for packets.

I did some of the flags and assertions wrong. Thanks to Brad Beckmann
for pointing this out.  I should have run the opt regressions instead
of the fast. I also screwed up some of the logical functions in the Flags
class.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mem/request.hh b/src/mem/request.hh
index 007c33acf..c7cadaa03 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -53,6 +53,8 @@ typedef Request* RequestPtr;
 
 class Request : public FastAlloc
 {
+    friend class Packet;
+
   public:
     typedef uint32_t FlagsType;
     typedef ::Flags<FlagsType> Flags;
@@ -455,8 +457,6 @@ class Request : public FastAlloc
 
         return false;
     }
-
-    friend class Packet;
 };
 
 #endif // __MEM_REQUEST_HH__