compilation fixes for gcc 4.5

git-svn-id: https://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk@170 36490176-9c1c-0410-b649-dbf2af5787bf
nextghost · May 26, 2010 · 6b15e6a · 6b15e6a
1 parent 0683f6d
commit 6b15e6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-26  Michael Riepe  <[email protected]>
+
+	* src/main.cpp:
+	* src/mpgfile.h:
+		Replace `index::index' with `class index' to make
+		gcc 4.5 happy.
+
 2010-03-06  Michael Riepe  <[email protected]>
 
 	* DISTFILES:

diff --git a/src/main.cpp b/src/main.cpp
@@ -171,7 +171,7 @@ main(int argc, char *argv[]) {
       return 1;
     }
 
-    index::index idx(*mpg);
+    class index idx(*mpg);
     int pics = idx.generate();
     if (pics <= 0) {
       fprintf(stderr, "%s: %s: %s\n", argv0, mpgfilename.c_str(),

diff --git a/src/mpgfile.h b/src/mpgfile.h
@@ -49,7 +49,7 @@ class mpgfile
   stream s[MAXAVSTREAMS];
   int videostreams, audiostreams;
   int initialoffset;
-  index::index idx;
+  class index idx;
   int pictures;
 
   mpgfile(inbuffer &b, int initial_offset);