Changeset 2d10dab in git

Timestamp:

Sep 14, 2010, 3:28:10 PM (13 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7504ddfe25cbc97ca03089b2d7dd8c1a3ff1d050

Parents:

41ab4214f2b17d7e50edffc7030e3805f2c58be4

Message:

debug stuff

git-svn-id: file:///usr/local/Singular/svn/trunk@13191 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/claptmpl.cc (modified) (4 diffs)
• kernel/fglm.h (modified) (2 diffs)
• kernel/fglmcomb.cc (modified) (1 diff)
• libfac/factor/MVMultiHensel.cc (modified) (1 diff)

Singular/claptmpl.cc

@@ -41 +41 @@
   //template class vector<poly>;
   #ifndef NOSTREAMIO
-  template ostream & operator<<(ostream &, const List<Factor<CanonicalForm> > &);
-  template ostream & operator<<(ostream &, const List<List<CanonicalForm> > &);
-  template ostream & operator<<(ostream &, const List<Variable> &);
-  template ostream & operator<<(ostream &, const Matrix<Variable> &);
+  template OSTREAM & operator<<(OSTREAM &, const List<Factor<CanonicalForm> > &);
+  template OSTREAM & operator<<(OSTREAM &, const List<List<CanonicalForm> > &);
+  template OSTREAM & operator<<(OSTREAM &, const List<Variable> &);
+  template OSTREAM & operator<<(OSTREAM &, const Matrix<Variable> &);
   #endif
 
@@ -82 +82 @@
     T exp() const { return _exp; }
 #ifndef NOSTREAMIO
-    //friend ostream & operator <<<>(ostream &, Substitution<T> &);
-    void print ( ostream& s ) const
+    //friend OSTREAM & operator <<<>(OSTREAM &, Substitution<T> &);
+    void print ( OSTREAM& s ) const
     {
       s << "("  << factor() << ")^" << exp();
@@ -113 +113 @@
 #ifndef NOSTREAMIO
 template <class T>
-ostream & operator <<(ostream & os, Substitution<T> &a)
+OSTREAM & operator <<(OSTREAM & os, Substitution<T> &a)
 {
   a.print(os);
   return os;
 }
-template ostream & operator <<(ostream &, Substitution<CanonicalForm> &);
-template ostream & operator <<(ostream &, const List<CanonicalForm> &);
-template ostream & operator <<(ostream &, const Array<CanonicalForm> &);
-template ostream & operator<<(ostream &, const List<Substitution<CanonicalForm> > &);
+template OSTREAM & operator <<(OSTREAM &, Substitution<CanonicalForm> &);
+template OSTREAM & operator <<(OSTREAM &, const List<CanonicalForm> &);
+template OSTREAM & operator <<(OSTREAM &, const Array<CanonicalForm> &);
+template OSTREAM & operator<<(OSTREAM &, const List<Substitution<CanonicalForm> > &);
 #endif
 
@@ -185 +185 @@
 
 #ifdef   KMATRIX_PRINT
-template    ostream &   operator << ( ostream&,const KMatrix<Rational>& );
-template    static  void    print_rational( ostream&,int,const Rational& );
+template    OSTREAM &   operator << ( OSTREAM&,const KMatrix<Rational>& );
+template    static  void    print_rational( OSTREAM&,int,const Rational& );
 #endif
 

kernel/fglm.h

@@ -40 +40 @@
     void newDivisor( int var ) { divisors[ ++divisors[0] ]= var; }
 #ifndef NOSTREAMIO
-friend ostream & operator <<(ostream &, fglmSelem);
+friend OSTREAM & operator <<(OSTREAM &, fglmSelem);
 #endif
 };
 #ifndef NOSTREAMIO
-inline ostream & operator <<(ostream & os, fglmSelem) { return os;};
+inline OSTREAM & operator <<(OSTREAM & os, fglmSelem) { return os;};
 #endif
 
@@ -60 +60 @@
     void newDivisor() { insertions--; }
 #ifndef NOSTREAMIO
-friend ostream & operator <<(ostream &, fglmDelem);
+friend OSTREAM & operator <<(OSTREAM &, fglmDelem);
 #endif
 };
 #ifndef NOSTREAMIO
-inline ostream & operator <<(ostream & os, fglmDelem) { return os;};
+inline OSTREAM & operator <<(OSTREAM & os, fglmDelem) { return os;};
 #endif
 

kernel/fglmcomb.cc

@@ -29 +29 @@
 
 #ifndef NOSTREAMIO
+#ifdef HAVE_IOSTREAM
+#include <iostream>
+#else
 #include <iostream.h>
+#endif
 #endif
 

libfac/factor/MVMultiHensel.cc

@@ -29 +29 @@
 #define HAVE_SINGULAR_ERROR
 #ifndef NOSTREAMIO
-void out_cf(char *s1,const CanonicalForm &f,char *s2);
+void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 #endif
 #endif