X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finifcns.h;h=a17c8d2dfb6761713db6dd6e4c0ce356d4972738;hb=6faa1dc08e887e3d9e0a2d0b1be6ccd50fc19422;hp=426a7e09172bb26c1b7cbe91c62cc61f932f2ced;hpb=a450af1f438d53e924a074c936c648991eddfc71;p=ginac.git

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 426a7e09..a17c8d2d 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,6 +28,9 @@
 
 namespace GiNaC {
 
+/** Complex conjugate. */
+DECLARE_FUNCTION_1P(conjugate_function)
+	
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
 	
@@ -116,24 +119,8 @@ DECLARE_FUNCTION_2P(Li)
 /** Nielsen's generalized polylogarithm. */
 DECLARE_FUNCTION_3P(S)
 
-// overloading at work: we cannot use the macros here
-/** Harmonic polylogarithm with only positive parameters. */
-class H2_SERIAL { public: static unsigned serial; };
-template<typename T1, typename T2>
-inline function H(const T1& p1, const T2& p2) {
-	return function(H2_SERIAL::serial, ex(p1), ex(p2));
-}
-/** Harmonic polylogarithm with signed parameters. */
-class H3_SERIAL { public: static unsigned serial; };
-template<typename T1, typename T2, typename T3>
-inline function H(const T1& p1, const T2& p2, const T3& p3) {
-	return function(H3_SERIAL::serial, ex(p1), ex(p2), ex(p3));
-}
-class H_SERIAL;
-template<> inline bool is_the_function<class H_SERIAL>(const ex& x)
-{
-	return is_the_function<H2_SERIAL>(x) || is_the_function<H3_SERIAL>(x);
-}
+/** Harmonic polylogarithm. */
+DECLARE_FUNCTION_2P(H)
 
 /** Gamma-function. */
 DECLARE_FUNCTION_1P(lgamma)
@@ -181,7 +168,7 @@ inline bool is_order_function(const ex & e)
 /** Converts a given list containing parameters for H in Remiddi/Vermaseren notation into
  *  the corresponding GiNaC functions.
  */
-ex convert_H_notation(const ex& parameterlst, const ex& arg);
+ex convert_H_to_Li(const ex& parameterlst, const ex& arg);
 
 } // namespace GiNaC