[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

pkienzle pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:40:28 UTC 2011


The following commit has been merged in the master branch:
commit 71afa9a5a1f5a1281a055335f66199a3b3dd80c1
Author: pkienzle <pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Thu May 2 15:09:49 2002 +0000

    Use std::ostream
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@400 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/ov-ex-mat.cc b/ov-ex-mat.cc
index 25ac0e8..308a84b 100644
--- a/ov-ex-mat.cc
+++ b/ov-ex-mat.cc
@@ -91,7 +91,7 @@ octave_ex_matrix::octave_ex_matrix(octave_complex_matrix ov)
 
 
 void 
-octave_ex_matrix::print(ostream& os,bool pr_as_read_syntax) const
+octave_ex_matrix::print(std::ostream& os,bool pr_as_read_syntax) const
 {
   os << x;
 }
diff --git a/ov-ex-mat.h b/ov-ex-mat.h
index a2dd549..aea199d 100644
--- a/ov-ex-mat.h
+++ b/ov-ex-mat.h
@@ -72,7 +72,7 @@ public:
    
   octave_value uminus (void) const { return new octave_ex_matrix(-x); } 
 
-  void print(ostream& os,bool pr_as_read_syntax) const;
+  void print(std::ostream& os,bool pr_as_read_syntax) const;
   
 private:
   GiNaC::matrix x;
diff --git a/ov-ex.cc b/ov-ex.cc
index 69319dd..0644d63 100644
--- a/ov-ex.cc
+++ b/ov-ex.cc
@@ -67,7 +67,7 @@ octave_ex::octave_ex(double d)
 }
 
 void 
-octave_ex::print(ostream& os,bool pr_as_read_syntax) const
+octave_ex::print(std::ostream& os,bool pr_as_read_syntax) const
 {
   os << x;
 }
diff --git a/ov-ex.h b/ov-ex.h
index e366017..e511d72 100644
--- a/ov-ex.h
+++ b/ov-ex.h
@@ -76,7 +76,7 @@ public:
 
   void decrement (void) { x = x-1;}
   
-  void print(ostream& os,bool pr_as_read_syntax) const;
+  void print(std::ostream& os,bool pr_as_read_syntax) const;
   
 private:
   GiNaC::ex x;
diff --git a/ov-relational.cc b/ov-relational.cc
index 50b08dc..9723424 100644
--- a/ov-relational.cc
+++ b/ov-relational.cc
@@ -50,7 +50,7 @@ octave_relational::octave_relational (const GiNaC::ex & lhs,
 }
 
 void
-octave_relational::print (ostream& os, bool pr_as_read_syntax) const
+octave_relational::print (std::ostream& os, bool pr_as_read_syntax) const
 {
   GiNaC::print_context pr(os);
  
diff --git a/ov-relational.h b/ov-relational.h
index 5b4201a..9b76e99 100644
--- a/ov-relational.h
+++ b/ov-relational.h
@@ -71,7 +71,7 @@ public:
 
   GiNaC::relational relational_value (bool = false) const { return rel; }
 
-  void print (ostream& os, bool pr_as_read_syntax = false) const;
+  void print (std::ostream& os, bool pr_as_read_syntax = false) const;
 
 private:
   
diff --git a/ov-sym.cc b/ov-sym.cc
index ceb2605..36dbf8a 100644
--- a/ov-sym.cc
+++ b/ov-sym.cc
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "ov-ex.h"
 #include "ov-sym.h"
 
-class ostream;
+// class ostream;
 
 octave_sym::octave_sym(char *str)
 {
@@ -42,7 +42,7 @@ octave_sym::uminus (void)
 } 
   
 void 
-octave_sym::print(ostream& os,bool pr_as_read_syntax) const
+octave_sym::print(std::ostream& os,bool pr_as_read_syntax) const
 {
   os << x;
 }
diff --git a/ov-sym.h b/ov-sym.h
index f264716..7f7b762 100644
--- a/ov-sym.h
+++ b/ov-sym.h
@@ -43,7 +43,7 @@ public:
 
   octave_value uminus (void); 
 
-  void print(ostream& os,bool pr_as_read_syntax) const;
+  void print(std::ostream& os,bool pr_as_read_syntax) const;
 
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
diff --git a/ov-vpa.cc b/ov-vpa.cc
index a76eec2..081e236 100644
--- a/ov-vpa.cc
+++ b/ov-vpa.cc
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/config.h>
 #include "ov-vpa.h"
 
-class ostream;
+// class ostream;
 
 octave_vpa::octave_vpa(void):octave_base_value()
 {
@@ -49,7 +49,7 @@ octave_vpa::octave_vpa( const GiNaC::ex& x):octave_base_value()
 }
 
 void
-octave_vpa::print (ostream& os, bool pr_as_read_syntax) const
+octave_vpa::print (std::ostream& os, bool pr_as_read_syntax) const
 {
   os << scalar;
 }
diff --git a/ov-vpa.h b/ov-vpa.h
index 4414983..18fb28b 100644
--- a/ov-vpa.h
+++ b/ov-vpa.h
@@ -80,7 +80,7 @@ public:
 
   void decrement (void) { --scalar; }
 
-  void print (ostream& os, bool pr_as_read_syntax = false) const;
+  void print (std::ostream& os, bool pr_as_read_syntax = false) const;
 
 private:
   

-- 
octave-symbolic



More information about the Pkg-octave-commit mailing list