Merge branch 'eit_test' into experimental

1 files changed, 10 insertions, 11 deletions

diff --git a/dish.h b/dish.h
index 07f0547..369a4fd 100644
--- a/dish.h
+++ b/dish.h
@@ -243,12 +243,12 @@ namespace SI
 #define SIZE_TABLE_128 128
 #define SIZE_TABLE_255 255
 
-class UnimplementedDescriptor;
+using namespace std;
 
 class DishDescriptor {
 public:
     DishDescriptor();
-   virtual ~DishDescriptor();
+    virtual ~DishDescriptor();
     const char* getName(void) const { return name; }
     const char* getShortText(void);
     const char *getDescription(void);
@@ -285,15 +285,14 @@ protected:
     char* seriesId;
     char* programId;
 
-
-   struct HuffmanTable {
-      unsigned int  startingAddress;
-      unsigned char character;
-      unsigned char numberOfBits;
-   };
-   static HuffmanTable Table128[SIZE_TABLE_128];
-   static HuffmanTable Table255[SIZE_TABLE_255];
-
+    struct HuffmanTable
+    {
+        unsigned int startingAddress;
+        unsigned char character;
+        unsigned char numberOfBits;
+    };
+    static HuffmanTable Table128[SIZE_TABLE_128];
+    static HuffmanTable Table255[SIZE_TABLE_255];
 };
 
 } /* namespace SI */