- put everything in "GiNaC" namespace

[ginac.git] / ginac / idx.h

diff --git a/ginac/idx.h b/ginac/idx.h
index c742db6bce9c38b6dd3dd094f3019cc69003eea8..fa0b8ce35f952170fe926e62ea9e7d33f636a804 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -1,7 +1,8 @@
 /** @file idx.h
  *
- *  Interface to GiNaC's indices.
- *
+ *  Interface to GiNaC's indices. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,6 +26,9 @@
 #include <string>
 #include <vector>
 #include <ginac/basic.h>
+#include <ginac/ex.h>
+
+namespace GiNaC {
 
 class idx : public basic
 {
@@ -88,11 +92,13 @@ protected:
 extern const idx some_idx;
 extern type_info const & typeid_idx;
 
-// macros
-
-#define ex_to_idx(X) (static_cast<idx const &>(*(X).bp))
+// utility functions
+inline const idx &ex_to_idx(const ex &e)
+{
+       return static_cast<const idx &>(*e.bp);
+}
 
-// other functions
+// global functions
 
 typedef vector<ex> exvector;
 
@@ -105,4 +111,6 @@ ex subs_indices(ex const & e, exvector const & idxv_contra,
                 exvector const & idxv_co);
 unsigned count_index(ex const & e, ex const & i);
 
+} // namespace GiNaC
+
 #endif // ndef __GINAC_IDX_H__