- power::derivative(): slight optimization.

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 1753b429be3b9694d05baa82ab3d2ed39baa480d..23d806b08cb2830518dcaed78844e6680b4d456b 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's color indices. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -25,56 +25,69 @@
 
 #include <string>
 #include <vector>
-#include <ginac/idx.h>
+#include "idx.h"
+#include "ex.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 class coloridx : public idx
 {
-    friend class color;
+       GINAC_DECLARE_REGISTERED_CLASS(coloridx, idx)
+
+       friend class color;
 
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       // default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    coloridx();
-    ~coloridx();
-    coloridx (coloridx const & other);
-    coloridx const & operator=(coloridx const & other);
+       coloridx();
+       ~coloridx();
+       coloridx (const coloridx & other);
+       const coloridx & operator=(const coloridx & other);
 protected:
-    void copy(coloridx const & other);
-    void destroy(bool call_parent);
+       void copy(const coloridx & other);
+       void destroy(bool call_parent);
 
-    // other constructors
+       // other constructors
 public:
-    explicit coloridx(bool cov);
-    explicit coloridx(string const & n, bool cov=false);
-    explicit coloridx(char const * n, bool cov=false);
-    explicit coloridx(unsigned const v, bool cov=false); 
+       explicit coloridx(bool cov);
+       explicit coloridx(const std::string & n, bool cov=false);
+       explicit coloridx(const char * n, bool cov=false);
+       explicit coloridx(unsigned v, bool cov=false); 
 
-    // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    bool info(unsigned inf) const;
+       basic * duplicate() const;
+       void printraw(std::ostream & os) const;
+       void printtree(std::ostream & os, unsigned indent) const;
+       void print(std::ostream & os, unsigned upper_precedence=0) const;
+       bool info(unsigned inf) const;
 
-    // new virtual functions which can be overridden by derived classes
-    // none
+       // new virtual functions which can be overridden by derived classes
+       // none
 
-    // non-virtual functions in this class
-    // none
+       // non-virtual functions in this class
+       // none
 
-    // member variables
-    // none
+       // member variables
+       // none
 };
 
 // global constants
 
 extern const coloridx some_coloridx;
-extern type_info const & typeid_coloridx;
+extern const std::type_info & typeid_coloridx;
 
-// macros
+// utility functions
+inline const coloridx &ex_to_coloridx(const ex &e)
+{
+       return static_cast<const coloridx &>(*e.bp);
+}
 
-#define ex_to_coloridx(X) (static_cast<coloridx const &>(*(X).bp))
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_COLORIDX_H__