X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fginac.h;h=abc5018f949f33a59fbaba71efad1cc404783ab4;hp=a2664573fcb7ae9a6e71e11f7e6428f904fedda1;hb=ae6c004bd31e02dda37357d74b641c101b116c73;hpb=619d77d2676f7f1a562fb9fefc0ba6754fe2d750

diff --git a/ginac/ginac.h b/ginac/ginac.h
index a2664573..abc5018f 100644
--- 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-2007 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,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"
 
@@ -66,11 +66,14 @@
 #include "color.h"
 #include "clifford.h"
 
+#include "factor.h"
+
 #include "excompiler.h"
 
-#ifdef __MAKECINT__
-#pragma link C++ nestedclass;
-#pragma link C++ nestedtypedef;
+#ifndef IN_GINAC
+#include "parser.h"
+#else
+#include "parser/parser.h"
 #endif
 
-#endif // ndef __GINAC_H__
+#endif // ndef GINAC_H