- put everything in "GiNaC" namespace

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 66e89aa4eb60b705cb48cba5a762beda47886e92..769647cacdeede3685ec276e804e774c814783b0 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -2,12 +2,32 @@
  *
  *  Interface to symbolic matrices */
 
  *
  *  Interface to symbolic matrices */
 

-#ifndef _MATRIX_H_
-#define _MATRIX_H_
+/*
+ *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __GINAC_MATRIX_H__
+#define __GINAC_MATRIX_H__

 
 

-#include "basic.h"
-#include "ex.h"

 #include <vector>
 #include <vector>

+#include <ginac/basic.h>
+#include <ginac/ex.h>
+
+namespace GiNaC {

 
 /** Symbolic matrices. */
 class matrix : public basic
 
 /** Symbolic matrices. */
 class matrix : public basic


@@ -126,8 +146,12 @@ inline ex charpoly(matrix const & m, ex const & lambda)
 inline matrix inverse(matrix const & m)
 { return m.inverse(); }
 
 inline matrix inverse(matrix const & m)
 { return m.inverse(); }
 

-// macros
+// utility functions
+inline const matrix &ex_to_matrix(const ex &e)
+{
+       return static_cast<const matrix &>(*e.bp);
+}

 
 

-#define ex_to_matrix(X) (static_cast<matrix const &>(*(X).bp))
+} // namespace GiNaC

 
 

-#endif // ndef _MATRIX_H_
+#endif // ndef __GINAC_MATRIX_H__