some changes to allow GiNaC to cooperate with cint:

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 769647cacdeede3685ec276e804e774c814783b0..8e7ab39e7cc92d57a1d4651da58e7f9cdaf2afab 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -27,7 +27,9 @@
 #include <ginac/basic.h>
 #include <ginac/ex.h>
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 /** Symbolic matrices. */
 class matrix : public basic
@@ -52,13 +54,13 @@ protected:
     // other constructors
 public:
     matrix(int r, int c);
-    matrix(int r, int c, vector<ex> const & m2);
+    matrix(int r, int c, exvector const & m2);
    
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void printraw(ostream & os) const;
     void print(ostream & os, unsigned upper_precedence=0) const;
+    void printraw(ostream & os) const;
     int nops() const;
     ex & let_op(int const i);
     ex expand(unsigned options=0) const;
@@ -100,7 +102,7 @@ protected:
 protected:
     int row;                    /**< number of rows      */
     int col;                    /**< number of columns   */
-    vector<ex> m;               /**< representation (cols indexed first) */
+    exvector m;               /**< representation (cols indexed first) */
     static unsigned precedence;
 };
 
@@ -152,6 +154,8 @@ inline const matrix &ex_to_matrix(const ex &e)
        return static_cast<const matrix &>(*e.bp);
 }
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_MATRIX_H__