Ok, NIDS is getting better and better, and I went ahead and cleaned up some

exception related code that's been annoying me.  You should no longer have to
include any exception header explicitly for normal operations, every class that
has it's own exception to throw defines it in it's own headers.

This may break some code that uses libbu++, but it's an easy fix, just delete
the include for exceptions.h.  Sometime soon I would also like to move from
Bu::ExceptionBase to Bu::Exception, but that will affect a lot more code than
this change did.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/nidsstream.h b/src/nidsstream.h
index f64fca4..c220e5c 100644
--- a/src/nidsstream.h
+++ b/src/nidsstream.h
@@ -13,10 +13,10 @@ namespace Bu
                 /**
                  * These can only be created by the Nids class.
                  */
-                NidsStream( Nids &rNids );
+                NidsStream( Nids &rNids, uint32_t uStream );
 
         public:
-                NidsStream( const NidsStream &rSrc );
+//              NidsStream( const NidsStream &rSrc );
                 virtual ~NidsStream();
 
                 virtual void close();
@@ -40,9 +40,12 @@ namespace Bu
 
         private:
                 Nids &rNids;
-                typedef struct Bu::Hash<int, struct Nids::Block *> BlockHash;
-                BlockHash hBlock;
-                long iPos; 
+                uint32_t uStream;
+                Nids::Block *pCurBlock;
+                uint32_t uCurBlock;
+                uint32_t uSize;
+                uint32_t uBlockSize;
+                uint32_t uPos; 
         };
 };