- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index ee7378180684df7fc2abf2d0df95696cc46e96ca..fdd33108ac199318eae9e2040089086eb6b58936 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -26,7 +26,9 @@
 #include <ginac/function.h>
 #include <ginac/ex.h>
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 /** Sine. */
 DECLARE_FUNCTION_1P(sin)
@@ -79,16 +81,35 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
+// overloading at work: we cannot use the macros
 /** Riemann's Zeta-function. */
-DECLARE_FUNCTION_1P(zeta)
-//DECLARE_FUNCTION_2P(zeta)
+extern const unsigned function_index_zeta1;
+inline function zeta(ex const & p1) {
+    return function(function_index_zeta1, p1);
+}
+/** Derivatives of Riemann's Zeta-function. */
+extern const unsigned function_index_zeta2;
+inline function zeta(ex const & p1, ex const & p2) {
+    return function(function_index_zeta2, p1, p2);
+}
 
 /** Gamma-function. */
 DECLARE_FUNCTION_1P(gamma)
 
-/** Psi-function (aka polygamma-function). */
-//DECLARE_FUNCTION_1P(psi)
-DECLARE_FUNCTION_2P(psi)
+/** Beta-function. */
+DECLARE_FUNCTION_2P(beta)
+
+// overloading at work: we cannot use the macros
+/** Psi-function (aka digamma-function). */
+extern const unsigned function_index_psi1;
+inline function psi(ex const & p1) {
+    return function(function_index_psi1, p1);
+}
+/** Derivatives of Psi-function (aka polygamma-functions). */
+extern const unsigned function_index_psi2;
+inline function psi(ex const & p1, ex const & p2) {
+    return function(function_index_psi2, p1, p2);
+}
     
 /** Factorial function. */
 DECLARE_FUNCTION_1P(factorial)
@@ -105,9 +126,11 @@ ex ncpower(ex const &basis, unsigned exponent);
 
 inline bool is_order_function(ex const & e)
 {
-       return is_ex_the_function(e, Order);
+    return is_ex_the_function(e, Order);
 }
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_INIFCNS_H__