- removed inert Diff() function; only Derivative() remains

[ginac.git] / ginac / inifcns_zeta.cpp

diff --git a/ginac/inifcns_zeta.cpp b/ginac/inifcns_zeta.cpp
index 4be6f0226cae4f35f983c89f071a8f5afd1414a9..7a8b089aa11131876f2d528dbd1f86c7a73cfe6f 100644 (file)
--- a/ginac/inifcns_zeta.cpp
+++ b/ginac/inifcns_zeta.cpp
@@ -31,9 +31,9 @@
 #include "symbol.h"
 #include "utils.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 //////////
 // Riemann's Zeta-function
@@ -74,14 +74,19 @@ static ex zeta1_eval(const ex & x)
     return zeta(x).hold();
 }
 
-static ex zeta1_diff(const ex & x, unsigned diff_param)
+static ex zeta1_deriv(const ex & x, unsigned deriv_param)
 {
-    GINAC_ASSERT(diff_param==0);
+    GINAC_ASSERT(deriv_param==0);
     
     return zeta(_ex1(), x);
 }
 
-const unsigned function_index_zeta1 = function::register_new("zeta", zeta1_eval, zeta1_evalf, zeta1_diff, NULL);
+const unsigned function_index_zeta1 =
+    function::register_new(function_options("zeta").
+                           eval_func(zeta1_eval).
+                           evalf_func(zeta1_evalf).
+                          derivative_func(zeta1_deriv).
+                          overloaded(2));
 
 //////////
 // Derivatives of Riemann's Zeta-function  zeta(0,x)==zeta(x)
@@ -98,11 +103,11 @@ static ex zeta2_eval(const ex & n, const ex & x)
     return zeta(n, x).hold();
 }
 
-static ex zeta2_diff(const ex & n, const ex & x, unsigned diff_param)
+static ex zeta2_deriv(const ex & n, const ex & x, unsigned deriv_param)
 {
-    GINAC_ASSERT(diff_param<2);
+    GINAC_ASSERT(deriv_param<2);
     
-    if (diff_param==0) {
+    if (deriv_param==0) {
         // d/dn zeta(n,x)
         throw(std::logic_error("cannot diff zeta(n,x) with respect to n"));
     }
@@ -110,8 +115,12 @@ static ex zeta2_diff(const ex & n, const ex & x, unsigned diff_param)
     return zeta(n+1,x);
 }
 
-const unsigned function_index_zeta2 = function::register_new("zeta", zeta2_eval, NULL, zeta2_diff, NULL);
+const unsigned function_index_zeta2 =
+    function::register_new(function_options("zeta").
+                           eval_func(zeta2_eval).
+                          derivative_func(zeta2_deriv).
+                          overloaded(2));
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC