Fix some apparent typos and misindentations.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index e48f3d8a19942773de59f3f50c189f04bee63845..759e825ab4ca06c7dedf446a25d325b00e32402e 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -3,7 +3,7 @@
  *  Interface to symbolic matrices */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -20,17 +20,17 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_MATRIX_H__
-#define __GINAC_MATRIX_H__
+#ifndef GINAC_MATRIX_H
+#define GINAC_MATRIX_H
 
-#include <vector>
-#include <string>
 #include "basic.h"
 #include "ex.h"
 #include "archive.h"
 
-namespace GiNaC {
+#include <string>
+#include <vector>
 
+namespace GiNaC {
 
 /** Helper template to allow initialization of matrices via an overloaded
  *  comma operator (idea stolen from Blitz++). */
@@ -101,7 +101,7 @@ public:
        matrix(unsigned r, unsigned c, const exvector & m2);
        matrix(unsigned r, unsigned c, const lst & l);
 
-       // First step of initialization of matrix with a comma-separated seqeuence
+       // First step of initialization of matrix with a comma-separated sequence
        // of expressions. Subsequent steps are handled by matrix_init<>::operator,().
        matrix_init<ex, exvector::iterator> operator=(const ex & x)
        {
@@ -250,4 +250,4 @@ inline ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name)
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_MATRIX_H__
+#endif // ndef GINAC_MATRIX_H