Replace use of NULL by C++11 nullptr.

[ginac.git] / ginac / function.cppy

diff --git a/ginac/function.cppy b/ginac/function.cppy
index 517f4566dff8799027cba532e24f9df6df39dd46..45f33ec16b53ba32d6e020067bf708f0ba262ced 100644 (file)
--- a/ginac/function.cppy
+++ b/ginac/function.cppy
@@ -304,7 +304,7 @@ void function::print(const print_context & c, unsigned level) const
 
 next_context:
        unsigned id = pc_info->options.get_id();
 
 next_context:
        unsigned id = pc_info->options.get_id();

-       if (id >= pdt.size() || pdt[id] == NULL) {
+       if (id >= pdt.size() || pdt[id] == nullptr) {

 
                // Method not found, try parent print_context class
                const print_context_class_info *parent_pc_info = pc_info->get_parent();
 
                // Method not found, try parent print_context class
                const print_context_class_info *parent_pc_info = pc_info->get_parent();


@@ -736,7 +736,7 @@ ex function::pderivative(unsigned diff_param) const // partial differentiation
        const function_options &opt = registered_functions()[serial];
        
        // No derivative defined? Then return abstract derivative object
        const function_options &opt = registered_functions()[serial];
        
        // No derivative defined? Then return abstract derivative object

-       if (opt.derivative_f == NULL)
+       if (opt.derivative_f == nullptr)

                return fderivative(serial, diff_param, seq);
 
        current_serial = serial;
                return fderivative(serial, diff_param, seq);
 
        current_serial = serial;


@@ -759,7 +759,7 @@ ex function::expl_derivative(const symbol & s) const // explicit differentiation
        const function_options &opt = registered_functions()[serial];
 
        // No explicit derivative defined? Then this function shall not be called!
        const function_options &opt = registered_functions()[serial];
 
        // No explicit derivative defined? Then this function shall not be called!

-       if (opt.expl_derivative_f == NULL)
+       if (opt.expl_derivative_f == nullptr)

                throw(std::logic_error("function::expl_derivative(): explicit derivation is called, but no such function defined"));
 
        current_serial = serial;
                throw(std::logic_error("function::expl_derivative(): explicit derivation is called, but no such function defined"));
 
        current_serial = serial;


@@ -780,7 +780,7 @@ ex function::power(const ex & power_param) const // power of function
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options &opt = registered_functions()[serial];
        
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options &opt = registered_functions()[serial];
        

-       if (opt.power_f == NULL)
+       if (opt.power_f == nullptr)

                return (new GiNaC::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);
 


@@ -804,7 +804,7 @@ ex function::expand(unsigned options) const
        const function_options &opt = registered_functions()[serial];
 
        // No expand defined? Then return the same function with expanded arguments (if required)
        const function_options &opt = registered_functions()[serial];
 
        // No expand defined? Then return the same function with expanded arguments (if required)

-       if (opt.expand_f == NULL) {
+       if (opt.expand_f == nullptr) {

                // Only expand arguments when asked to do so
                if (options & expand_options::expand_function_args)
                        return inherited::expand(options);
                // Only expand arguments when asked to do so
                if (options & expand_options::expand_function_args)
                        return inherited::expand(options);