- fixed bug in normal(): normal(x^a) became (x^(-a))^(-1)

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 644492d852dcb42f9f2c697a86409f7b8e8a505f..176f67943ccbfecdb9af7fb7ba4f035aae790196 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -23,12 +23,12 @@
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 
-#include <ginac/function.h>
-#include <ginac/ex.h>
+#include "function.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
@@ -87,12 +87,12 @@ DECLARE_FUNCTION_1P(Li3)
 // overloading at work: we cannot use the macros
 /** Riemann's Zeta-function. */
 extern const unsigned function_index_zeta1;
-inline function zeta(ex const & p1) {
+inline function zeta(const ex & 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) {
+inline function zeta(const ex & p1, const ex & p2) {
     return function(function_index_zeta2, p1, p2);
 }
 
@@ -105,12 +105,12 @@ 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) {
+inline function psi(const ex & 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) {
+inline function psi(const ex & p1, const ex & p2) {
     return function(function_index_psi2, p1, p2);
 }
     
@@ -123,17 +123,23 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex const &eqns, ex const &symbols);
+/** Inert differentiation. */
+DECLARE_FUNCTION_2P(Diff)
 
-ex ncpower(ex const &basis, unsigned exponent);
+/** Inert partial differentiation operator. */
+DECLARE_FUNCTION_2P(Derivative)
 
-inline bool is_order_function(ex const & e)
+ex lsolve(const ex &eqns, const ex &symbols);
+
+ex ncpower(const ex &basis, unsigned exponent);
+
+inline bool is_order_function(const ex & e)
 {
     return is_ex_the_function(e, Order);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INIFCNS_H__