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 2d2a9e9d5280916acaff2f55ecc99410f172d58b..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-2008 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
@@ -20,8 +20,8 @@
  *  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"
 
@@ -71,14 +71,9 @@
 #include "excompiler.h"
 
 #ifndef IN_GINAC
-#include "parser.hpp"
+#include "parser.h"
 #else
-#include "parser/parser.hpp"
+#include "parser/parser.h"
 #endif
 
-#ifdef __MAKECINT__
-#pragma link C++ nestedclass;
-#pragma link C++ nestedtypedef;
-#endif
-
-#endif // ndef __GINAC_H__
+#endif // ndef GINAC_H