[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323
Bernhard R. Link
brlink at debian.org
Tue Apr 24 15:53:22 UTC 2012
The following commit has been merged in the cleanedupstream branch:
commit b0023f96cd42670a2d4cb9a2b7774993081a1504
Author: Martin Lee <martinlee84 at web.de>
Date: Tue Feb 21 15:43:27 2012 +0100
fix: need std::
diff --git a/factory/debug.h b/factory/debug.h
index 8f05f56..e1251a0 100644
--- a/factory/debug.h
+++ b/factory/debug.h
@@ -20,17 +20,17 @@ void deb_inc_level();
void deb_dec_level();
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)
#define DEBDECLEVEL(stream, msg)
diff --git a/factory/fac_berlekamp.cc b/factory/fac_berlekamp.cc
index 896fd16..29b47c0 100644
--- a/factory/fac_berlekamp.cc
+++ b/factory/fac_berlekamp.cc
@@ -20,10 +20,10 @@ void QprintFF( int ** Q, int n )
{
for ( int i = 0; i < n; i++ ) {
for ( int j = 0; j < n; j++ )
- cerr << Q[i][j] << " ";
- cerr << endl;
+ std::cerr << Q[i][j] << " ";
+ std::cerr << std::endl;
}
- cerr << endl;
+ std::cerr << std::endl;
}
#endif /* DEBUGOUTPUT */
@@ -32,12 +32,12 @@ void QprintGF( int ** Q, int n )
{
for ( int i = 0; i < n; i++ ) {
for ( int j = 0; j < n; j++ ) {
- gf_print( cerr, Q[i][j] );
- cerr << " ";
+ gf_print( std::cerr, Q[i][j] );
+ std::cerr << " ";
}
- cerr << endl;
+ std::cerr << std::endl;
}
- cerr << endl;
+ std::cerr << std::endl;
}
#endif /* DEBUGOUTPUT */
diff --git a/factory/fac_univar.cc b/factory/fac_univar.cc
index 811cbb2..ca2292e 100644
--- a/factory/fac_univar.cc
+++ b/factory/fac_univar.cc
@@ -30,20 +30,20 @@ static modpk theModulus;
#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
hprint ( int * a )
{
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 */
#define DEBOUTHPRINT(stream, msg, hg)
--
an open source computer algebra system
More information about the debian-science-commits
mailing list