conjugate() symbolic function renamed to conjugate_function()

diff --git a/ginac/ex.h b/ginac/ex.h
index ef121bc5d2402a1878f5f0a2d2869898f50a63bf..13177e28b9d6613fdeef29d6ebcdc51fc2193421 100644 (file)
--- 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 4ffbe2540726e1f75a79f719595cc816a5152344..fa5e9a20fb4e2f0aff9fea5d09663bf38d709f2a 100644 (file)
--- 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 19a66d356157ab2584b995c13241658922cd7aeb..a17c8d2dfb6761713db6dd6e4c0ce356d4972738 100644 (file)
--- 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 76d063eb952455259ebe42629c8333da149bb875..2f8afc006700e698779b5bd4bb933d21138b1d10 100644 (file)
--- 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;
        }