X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=07e82e19d2578c73e6c10e3e9cf76caa6a60e797;hp=e1533be27aba0d57cd126b8ae27cb02f719479ec;hb=8fa654f2637fa755e890499ece1a7bc498779ea3;hpb=ee1ec9db30b446d2d6348df2ce758ed2ff62a310

diff --git a/ginac/function.pl b/ginac/function.pl
index e1533be2..07e82e19 100644
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -2,7 +2,7 @@
 
 #  function.pl options: \$maxargs=${maxargs}
 # 
-#  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+#  GiNaC Copyright (C) 1999-2010 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
@@ -292,7 +292,7 @@ $interface=<<END_OF_INTERFACE;
  *  Please do not modify it directly, edit the perl script instead!
  *  function.pl options: \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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
@@ -536,6 +536,7 @@ public:
 	static unsigned register_new(function_options const & opt);
 	static unsigned current_serial;
 	static unsigned find_function(const std::string &name, unsigned nparams);
+	static std::vector<function_options> get_registered_functions() { return registered_functions(); };
 	unsigned get_serial() const {return serial;}
 	std::string get_name() const;
 
@@ -574,7 +575,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
  *  Please do not modify it directly, edit the perl script instead!
  *  function.pl options: \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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
@@ -1121,7 +1122,7 @@ ex function::conjugate() const
 	const function_options & opt = registered_functions()[serial];
 
 	if (opt.conjugate_f==0) {
-		return exprseq::conjugate();
+		return conjugate_function(*this).hold();
 	}
 
 	if (opt.conjugate_use_exvector_args) {
@@ -1311,8 +1312,8 @@ ex function::power(const ex & power_param) const // power of function
 	
 	// No derivative defined? Then return abstract derivative object
 	if (opt.power_f == NULL)
-		return (new power::power(*this, power_param))->setflag(status_flags::dynallocated |
-	                                               status_flags::evaluated);
+		return (new GiNaC::power(*this, power_param))->setflag(status_flags::dynallocated |
+		                                                       status_flags::evaluated);
 
 	current_serial = serial;
 	if (opt.power_use_exvector_args)