From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Sun, 4 Jul 2004 15:07:05 +0000 (+0000)
Subject: conjugate() symbolic function renamed to conjugate_function()
X-Git-Tag: release_1-3-0~53
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=979b2636e20e037573c7c178a2e99fba282ed711

conjugate() symbolic function renamed to conjugate_function()
---

diff --git a/ginac/ex.h b/ginac/ex.h
index ef121bc5..13177e28 100644
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -752,6 +752,9 @@ inline size_t nops(const ex & thisex)
 inline ex expand(const ex & thisex, unsigned options = 0)
 { return thisex.expand(options); }
 
+inline ex conjugate(const ex & thisex)
+{ return thisex.conjugate(); }
+
 inline bool has(const ex & thisex, const ex & pattern)
 { return thisex.has(pattern); }
 
diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 4ffbe254..fa5e9a20 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -48,7 +48,7 @@ static ex conjugate_evalf(const ex & arg)
 	if (is_exactly_a<numeric>(arg)) {
 		return ex_to<numeric>(arg).conjugate();
 	}
-	return conjugate(arg).hold();
+	return conjugate_function(arg).hold();
 }
 
 static ex conjugate_eval(const ex & arg)
@@ -66,10 +66,11 @@ static ex conjugate_conjugate(const ex & arg)
 	return arg;
 }
 
-REGISTER_FUNCTION(conjugate, eval_func(conjugate_eval).
+REGISTER_FUNCTION(conjugate_function, eval_func(conjugate_eval).
                        evalf_func(conjugate_evalf).
                        print_func<print_latex>(conjugate_print_latex).
-                       conjugate_func(conjugate_conjugate));
+                       conjugate_func(conjugate_conjugate).
+                       set_name("conjugate","conjugate"));
 
 //////////
 // absolute value
diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 19a66d35..a17c8d2d 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -29,7 +29,7 @@
 namespace GiNaC {
 
 /** Complex conjugate. */
-DECLARE_FUNCTION_1P(conjugate)
+DECLARE_FUNCTION_1P(conjugate_function)
 	
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 76d063eb..2f8afc00 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -224,7 +224,7 @@ ex symbol::eval(int level) const
 ex symbol::conjugate() const
 {
 	if (this->domain == domain::complex) {
-		return GiNaC::conjugate(*this).hold();
+		return GiNaC::conjugate_function(*this).hold();
 	} else {
 		return *this;
 	}