X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Flortensor.h;h=8fbadd3de9426344d62be55ced5ea42cdf2ef5b7;hp=1eebc595fdb8899d445e10db1e629e7b14d24bf3;hb=dad107ff48f68d45e72469a8716df375ae145cf3;hpb=dc074d042a23f07350f0c2c68a2477763a5aaba0

diff --git a/ginac/lortensor.h b/ginac/lortensor.h
index 1eebc595..8fbadd3d 100644
--- a/ginac/lortensor.h
+++ b/ginac/lortensor.h
@@ -1,6 +1,6 @@
 /** @file lortensor.h
  *
- *  Interface to GiNaC´s lortensor objects. */
+ *  Interface to GiNaC's Lorentz tensors. */
 
 /*
  *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
@@ -29,9 +29,7 @@
 #include "indexed.h"
 #include "lorentzidx.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 
 /** This class holds an object carrying Lorentz indices (of class
@@ -48,8 +46,8 @@ class lortensor : public indexed
 	friend lortensor lortensor_delta(const ex & mu, const ex & nu);
 	friend lortensor lortensor_epsilon(const ex & mu, const ex & nu,
 									   const ex & rho, const ex & sigma);
-	friend lortensor lortensor_vector(const string & n, const ex & mu);
-	friend lortensor lortensor_symbolic(const string & name, const exvector & iv);
+	friend lortensor lortensor_vector(const std::string & n, const ex & mu);
+	friend lortensor lortensor_symbolic(const std::string & name, const exvector & iv);
 
 	friend ex simplify_lortensor_mul(const ex & m);
 	friend ex simplify_lortensor(const ex & e);
@@ -67,16 +65,6 @@ public:
 
 // member functions
 
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	lortensor();
-	~lortensor();
-	lortensor(const lortensor & other);
-	const lortensor & operator=(const lortensor & other);
-protected:
-	void copy(const lortensor & other);
-	void destroy(bool call_parent);
-
 	// other constructors
 protected:
 	lortensor(lortensor_types const lt, const std::string & n);
@@ -90,14 +78,12 @@ protected:
 
 	//functions overriding virtual functions from base classes
 public:
-	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;
 	ex eval(int level=0) 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;
@@ -126,11 +112,6 @@ private:
 	static unsigned next_serial;
 };
 
-// global constants
-
-extern const lortensor some_lortensor;
-extern const std::type_info & typeid_lortensor;
-
 // utility functions
 	
 inline const lortensor & ex_to_lortensor(const ex &e)
@@ -147,14 +128,12 @@ lortensor lortensor_g(const ex & mu, const ex & nu);
 lortensor lortensor_delta(const ex & mu, const ex & nu);
 lortensor lortensor_epsilon(const ex & mu, const ex & nu,
                             const ex & rho, const ex & sigma);
-lortensor lortensor_vector(const string & n, const ex & mu);
-lortensor lortensor_symbolic(const string & name, const exvector & iv);
+lortensor lortensor_vector(const std::string & n, const ex & mu);
+lortensor lortensor_symbolic(const std::string & name, const exvector & iv);
 
 ex simplify_lortensor_mul(const ex & m);
 ex simplify_lortensor(const ex & e);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_LORTENSOR_H__