X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Findexed.h;h=44021b8e23302050e14ebedd72892c37068c5eff;hb=d4a2b696653478859882c13d585ad03549403fa7;hp=5b5856e5838f8021a5e859a392b25911a5b266f4;hpb=2565309dd7c38635c191eacf2a4af9b23fc0d310;p=ginac.git

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 5b5856e5..44021b8e 100644
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -24,74 +24,74 @@
 #define __GINAC_INDEXED_H__
 
 #include <string>
-#include <ginac/exprseq.h>
+#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__