Merge branch 'c++11' in preparation for version 1.7.0.

[ginac.git] / ginac / ginac.h

diff --git a/ginac/ginac.h b/ginac/ginac.h
index 491b05667a2b60526deed34910c04029eef67b09..024183bc6a71dfa9c8360aafcd5d9e63d188b614 100644 (file)
--- a/ginac/ginac.h
+++ b/ginac/ginac.h
@@ -3,7 +3,7 @@
  *  This include file includes all other public GiNaC headers. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -17,21 +17,24 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_H__
-#define __GINAC_H__
+#ifndef GINAC_H
+#define GINAC_H
+
+#include "version.h"
 
 #include "basic.h"
 
 #include "ex.h"
 #include "normal.h"
 #include "archive.h"
+#include "print.h"
 
 #include "constant.h"
 #include "fail.h"
-#include "idx.h"
+#include "integral.h"
 #include "lst.h"
 #include "matrix.h"
 #include "numeric.h"
@@ -39,29 +42,38 @@
 #include "relational.h"
 #include "structure.h"
 #include "symbol.h"
+#include "pseries.h"
+#include "wildcard.h"
+#include "symmetry.h"
 
 #include "expair.h"
 #include "expairseq.h"
 #include "add.h"
 #include "mul.h"
-#include "pseries.h"
 
 #include "exprseq.h"
 #include "function.h"
 #include "ncmul.h"
 
 #include "inifcns.h"
+#include "fderivative.h"
 #include "operators.h"
+#include "hash_map.h"
 
-#ifndef GINAC_BASE_ONLY
+#include "idx.h"
 #include "indexed.h"
-#include "clifford.h"
-#include "coloridx.h"
+#include "tensor.h"
 #include "color.h"
-#include "isospin.h"
-#include "lorentzidx.h"
-#include "simp_lor.h"
-#include "lortensor.h"
-#endif // ndef GINAC_BASE_ONLY
+#include "clifford.h"
+
+#include "factor.h"
+
+#include "excompiler.h"
+
+#ifndef IN_GINAC
+#include "parser.h"
+#else
+#include "parser/parser.h"
+#endif
 
-#endif // ndef __GINAC_H__
+#endif // ndef GINAC_H