X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ffunction.hppy;h=29c32a2dad01702cbc31c0baec246df0c95d9907;hb=b16d5b34f40c9dcd6bd4f9e1fdeeb65cb1612db3;hp=4d3b887c2822713ab45df5c3c506eae87dd56acf;hpb=0052e44b34c982b13b08454fd6c9429fe7a90f71;p=ginac.git

diff --git a/ginac/function.hppy b/ginac/function.hppy
index 4d3b887c..29c32a2d 100644
--- a/ginac/function.hppy
+++ b/ginac/function.hppy
@@ -6,7 +6,7 @@
  *  This file was generated automatically from function.hppy.
  *  Please do not modify it directly, edit function.hppy instead!
  *
- *  GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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,8 +28,6 @@
 
 #include "exprseq.h"
 
-// CINT needs <algorithm> to work properly with <vector>
-#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -134,7 +132,7 @@ public:
 		return *this;
 	}
 
-	function_options & set_return_type(unsigned rt, const return_type_t* rtt = 0);
+	function_options & set_return_type(unsigned rt, const return_type_t* rtt = nullptr);
 	function_options & do_not_evalf_params();
 	function_options & remember(unsigned size, unsigned assoc_size=0,
 	                            unsigned strategy=remember_strategies::delete_never);
@@ -145,8 +143,8 @@ public:
 	unsigned get_nparams() const { return nparams; }
 
 protected:
-	bool has_derivative() const { return derivative_f != NULL; }
-	bool has_power() const { return power_f != NULL; }
+	bool has_derivative() const { return derivative_f != nullptr; }
+	bool has_power() const { return power_f != nullptr; }
 	void test_and_set_nparams(unsigned n);
 	void set_print_func(unsigned id, print_funcp f);
 
@@ -222,33 +220,33 @@ public:
 ---
 	// end of generated lines
 	function(unsigned ser, const exprseq & es);
-	function(unsigned ser, const exvector & v, bool discardable = false);
-	function(unsigned ser, std::auto_ptr<exvector> vp);
+	function(unsigned ser, const exvector & v);
+	function(unsigned ser, exvector && v);
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	unsigned precedence() const {return 70;}
-	ex expand(unsigned options=0) const;
-	ex eval(int level=0) const;
-	ex evalf(int level=0) const;
-	ex eval_ncmul(const exvector & v) const;
-	unsigned calchash() const;
-	ex series(const relational & r, int order, unsigned options = 0) const;
-	ex thiscontainer(const exvector & v) const;
-	ex thiscontainer(std::auto_ptr<exvector> vp) const;
-	ex conjugate() const;
-	ex real_part() const;
-	ex imag_part() const;
-	void archive(archive_node& n) const;
-	void read_archive(const archive_node& n, lst& syms);
-	bool info(unsigned inf) const;
+	void print(const print_context & c, unsigned level = 0) const override;
+	unsigned precedence() const override {return 70;}
+	ex expand(unsigned options=0) const override;
+	ex eval() const override;
+	ex evalf() const override;
+	ex eval_ncmul(const exvector & v) const override;
+	unsigned calchash() const override;
+	ex series(const relational & r, int order, unsigned options = 0) const override;
+	ex thiscontainer(const exvector & v) const override;
+	ex thiscontainer(exvector && v) const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+	void archive(archive_node& n) const override;
+	void read_archive(const archive_node& n, lst& syms) override;
+	bool info(unsigned inf) const override;
 protected:
-	ex derivative(const symbol & s) const;
-	bool is_equal_same_type(const basic & other) const;
-	bool match_same_type(const basic & other) const;
-	unsigned return_type() const;
-	return_type_t return_type_tinfo() const;
+	ex derivative(const symbol & s) const override;
+	bool is_equal_same_type(const basic & other) const override;
+	bool match_same_type(const basic & other) const override;
+	unsigned return_type() const override;
+	return_type_t return_type_tinfo() const override;
 	
 	// new virtual functions which can be overridden by derived classes
 	// none