#ifndef around namespace GiNaC { }

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 97a9f6668446e6ba44a72ce90caedab490f7ba1d..2767c89b1d1aef996250e7ec1a02a14233c625f9 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -1,7 +1,8 @@
 /** @file relational.h
  *
- *  Interface to relations between expressions.
- *
+ *  Interface to relations between expressions. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,6 +23,13 @@
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 
+#include <ginac/basic.h>
+#include <ginac/ex.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 /** This class holds a relation consisting of two expressions and a logical
  *  relation between them. */
 class relational : public basic
@@ -91,8 +99,14 @@ protected:
 extern const relational some_relational;
 extern type_info const & typeid_relational;
 
-#define ex_to_relational(X) static_cast<relational const &>(*(X).bp)
-
-#endif // ndef __GINAC_RELATIONAL_H__
+// utility functions
+inline const relational &ex_to_relational(const ex &e)
+{
+       return static_cast<const relational &>(*e.bp);
+}
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
+#endif // ndef __GINAC_RELATIONAL_H__