Changeset 346edc8 in git

Timestamp:

Feb 22, 2012, 11:03:36 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f3a82f4d26a5b3be3272d4081585f856bf75a07c

Parents:

f71453f2ec66e0b065f7b5f2c759e1db2377dd27

git-author:

Martin Lee <martinlee84@web.de>2012-02-22 11:03:36+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-02-22 15:31:04+01:00

Message:

fix: need std::

Location:

factory

Files:

• debug.h (modified) (2 diffs)
• fac_berlekamp.cc (modified) (2 diffs)
• fac_univar.cc (modified) (2 diffs)

factory/debug.h

@@ -13 +13 @@
 
 #ifdef DEBUGOUTPUT
+#include <iostream>
 #ifdef HAVE_IOSTREAM
 #include <iostream>
@@ -22 +23 @@
 extern char * deb_level_msg;
 #define DEBINCLEVEL(stream, msg) \
-(stream << deb_level_msg << "entering << " << msg << " >>" << endl, deb_inc_level())
+(std::stream << deb_level_msg << "entering << " << msg << " >>" << std::endl, deb_inc_level())
 #define DEBDECLEVEL(stream, msg) \
-(deb_dec_level(), stream << deb_level_msg << "leaving << " << msg << " >>" << endl)
+(deb_dec_level(), std::stream << deb_level_msg << "leaving << " << msg << " >>" << std::endl)
 #define DEBOUTSL(stream) \
-(stream << deb_level_msg, stream.flush())
+(std::stream << deb_level_msg, std::stream.flush())
 #define DEBOUT(stream, objects) \
-(stream << objects, stream.flush())
+(std::stream << objects, std::stream.flush())
 #define DEBOUTENDL(stream) \
-(stream << endl)
+(std::stream << std::endl)
 #define DEBOUTLN(stream, objects) \
-(stream << deb_level_msg << objects << endl)
+(std::stream << deb_level_msg << objects << std::endl)
 #else /* DEBUGOUTPUT */
-#define DEBINCLEVEL(stream, msg) ((void) 0)
-#define DEBDECLEVEL(stream, msg) ((void) 0)
-#define DEBOUTSL(stream) ((void) 0)
-#define DEBOUT(stream, objects) ((void) 0)
-#define DEBOUTENDL(stream) ((void) 0)
-#define DEBOUTLN(stream, objects) ((void) 0)
+#define DEBINCLEVEL(stream, msg)
+#define DEBDECLEVEL(stream, msg)
+#define DEBOUTSL(stream)
+#define DEBOUT(stream, objects)
+#define DEBOUTENDL(stream)
+#define DEBOUTLN(stream, objects)
 #endif /* DEBUGOUTPUT */

factory/fac_berlekamp.cc

@@ -22 +22 @@
     for ( int i = 0; i < n; i++ ) {
         for ( int j = 0; j < n; j++ )
-            cerr << Q[i][j] << "  ";
-        cerr << endl;
-    }
-    cerr << endl;
+            std::cerr << Q[i][j] << "  ";
+        std::cerr << std::endl;
+    }
+    std::cerr << std::endl;
 }
 #endif /* DEBUGOUTPUT */
@@ -34 +34 @@
     for ( int i = 0; i < n; i++ ) {
         for ( int j = 0; j < n; j++ ) {
-            gf_print( cerr, Q[i][j] );
-            cerr << "  ";
-        }
-        cerr << endl;
-    }
-    cerr << endl;
+            gf_print( std::cerr, Q[i][j] );
+            std::cerr << "  ";
+        }
+        std::cerr << std::endl;
+    }
+    std::cerr << std::endl;
 }
 #endif /* DEBUGOUTPUT */

factory/fac_univar.cc

@@ -32 +32 @@
 #ifdef DEBUGOUTPUT
 #define DEBOUTHPRINT(stream, msg, hg) \
-{stream << deb_level_msg << msg, stream.flush(); hprint( hg ); stream << endl;}
+{std::stream << deb_level_msg << msg, std::stream.flush(); hprint( hg ); std::stream << std::endl;}
 
 static void
@@ -38 +38 @@
 {
     int n = a[0];
-    cerr << "( " << n << ": ";
+    std::cerr << "( " << n << ": ";
     int i = 1;
     while ( i < n ) {
         if ( a[i] != 0 )
-            cerr << i << " ";
+            std::cerr << i << " ";
         i++;
     }
-    cerr << ")";
+    std::cerr << ")";
 }
 #else /* DEBUGOUTPUT */