- config.guess, config.sub: upgraded from FSF.

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 556f92ff2e9b8dd2e3d24e7e58499bbaa6ec01f6..44021b8e23302050e14ebedd72892c37068c5eff 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -26,72 +26,72 @@
 #include <string>
 #include "exprseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Base class for non-commutative indexed objects */
 class indexed : public exprseq
 {
-    GINAC_DECLARE_REGISTERED_CLASS(indexed, exprseq)
+       GINAC_DECLARE_REGISTERED_CLASS(indexed, exprseq)
 
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       // default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    indexed();
-    ~indexed();
-    indexed(const indexed & other);
-    const indexed & operator=(const indexed & other);
+       indexed();
+       ~indexed();
+       indexed(const indexed & other);
+       const indexed & operator=(const indexed & other);
 protected:
-    void copy(const indexed & other); 
-    void destroy(bool call_parent);
+       void copy(const indexed & other); 
+       void destroy(bool call_parent);
 
-    // other constructors
+       // other constructors
 public:
-    indexed(const ex & i1);
-    indexed(const ex & i1, const ex & i2);
-    indexed(const ex & i1, const ex & i2, const ex & i3);
-    indexed(const ex & i1, const ex & i2, const ex & i3, const ex & i4);
-    indexed(const exvector & iv);
-    indexed(exvector * iv);
-
-    // functions overriding virtual functions from base classes
+       indexed(const ex & i1);
+       indexed(const ex & i1, const ex & i2);
+       indexed(const ex & i1, const ex & i2, const ex & i3);
+       indexed(const ex & i1, const ex & i2, const ex & i3, const ex & i4);
+       indexed(const exvector & iv);
+       indexed(exvector * iv);
+
+       // functions overriding virtual functions from base 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;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const;
-    bool info(unsigned inf) const;
-    ex diff(const symbol & s) const;
-    exvector get_indices(void) 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;
+       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
+       bool info(unsigned inf) const;
+       exvector get_indices(void) const;
 protected:
-    int compare_same_type(const basic & other) const;
-    bool is_equal_same_type(const basic & other) const;
-    unsigned return_type(void) const;
-    unsigned return_type_tinfo(void) const;
-    ex thisexprseq(const exvector & v) const;
-    ex thisexprseq(exvector * vp) const;
-
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
+       ex derivative(const symbol & s) const;
+       int compare_same_type(const basic & other) const;
+       bool is_equal_same_type(const basic & other) const;
+       unsigned return_type(void) const;
+       unsigned return_type_tinfo(void) const;
+       ex thisexprseq(const exvector & v) const;
+       ex thisexprseq(exvector * vp) const;
+
+       // new virtual functions which can be overridden by derived classes
+       // none
+       
+       // non-virtual functions in this class
 protected:
-    void printrawindices(ostream & os) const;
-    void printtreeindices(ostream & os, unsigned indent) const;
-    void printindices(ostream & os) const;
-    bool all_of_type_idx(void) const;
+       void printrawindices(std::ostream & os) const;
+       void printtreeindices(std::ostream & os, unsigned indent) const;
+       void printindices(std::ostream & os) const;
+       bool all_of_type_idx(void) const;
 
 // member variables
-    // none
+       // none
 };
 
 // global constants
 
 extern const indexed some_indexed;
-extern const type_info & typeid_indexed;
+extern const std::type_info & typeid_indexed;
 
 // utility functions
 inline const indexed &ex_to_indexed(const ex &e)
@@ -99,8 +99,8 @@ inline const indexed &ex_to_indexed(const ex &e)
        return static_cast<const indexed &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INDEXED_H__