* Removed @acronym{}, it looks silly.

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index eaf848832f11e776c55833e01bc130c47863746d..e0ddc8bbe6ef0d885cdf614a49f757b3a1771ab9 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -26,9 +26,7 @@
 #include "function.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
@@ -93,13 +91,15 @@ DECLARE_FUNCTION_1P(Li3)
 // overloading at work: we cannot use the macros here
 /** Riemann's Zeta-function. */
 extern const unsigned function_index_zeta1;
-inline function zeta(const ex & p1) {
-       return function(function_index_zeta1, p1);
+template<typename T1>
+inline function zeta(const T1 & p1) {
+       return function(function_index_zeta1, ex(p1));
 }
 /** Derivatives of Riemann's Zeta-function. */
 extern const unsigned function_index_zeta2;
-inline function zeta(const ex & p1, const ex & p2) {
-       return function(function_index_zeta2, p1, p2);
+template<typename T1, typename T2>
+inline function zeta(const T1 & p1, const T2 & p2) {
+       return function(function_index_zeta2, ex(p1), ex(p2));
 }
 
 /** Gamma-function. */
@@ -112,13 +112,15 @@ DECLARE_FUNCTION_2P(beta)
 // overloading at work: we cannot use the macros here
 /** Psi-function (aka digamma-function). */
 extern const unsigned function_index_psi1;
-inline function psi(const ex & p1) {
-       return function(function_index_psi1, p1);
+template<typename T1>
+inline function psi(const T1 & p1) {
+       return function(function_index_psi1, ex(p1));
 }
 /** Derivatives of Psi-function (aka polygamma-functions). */
 extern const unsigned function_index_psi2;
-inline function psi(const ex & p1, const ex & p2) {
-       return function(function_index_psi2, p1, p2);
+template<typename T1, typename T2>
+inline function psi(const T1 & p1, const T2 & p2) {
+       return function(function_index_psi2, ex(p1), ex(p2));
 }
        
 /** Factorial function. */
@@ -130,20 +132,14 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-/** Inert partial differentiation operator. */
-DECLARE_FUNCTION_2P(Derivative)
-
-ex lsolve(const ex &eqns, const ex &symbols);
-
-ex ncpower(const ex &basis, unsigned exponent);
+ex lsolve(const ex &eqns, const ex &symbols, unsigned options = determinant_algo::automatic);
 
+/** Check whether a function is the Order (O(n)) function. */
 inline bool is_order_function(const ex & e)
 {
        return is_ex_the_function(e, Order);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INIFCNS_H__