Use C++11 'nullptr' where applicable.

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index 85d13af666e25059c682df4e3e8f3abff0632c46..eb8566c3457f055150376e3ff2e6ba806abb6b4b 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -34,13 +34,13 @@
 
 namespace GiNaC {
 
-/** Used internally by operator+() to add two ex objects together. */
+/** Used internally by operator+() to add two ex objects. */
 static inline const ex exadd(const ex & lh, const ex & rh)
 {
-       return (new add(lh,rh))->setflag(status_flags::dynallocated);
+       return dynallocate<add>(lh, rh);
 }
 
-/** Used internally by operator*() to multiply two ex objects together. */
+/** Used internally by operator*() to multiply two ex objects. */
 static inline const ex exmul(const ex & lh, const ex & rh)
 {
        // Check if we are constructing a mul object or a ncmul object.  Due to
@@ -48,16 +48,16 @@ static inline const ex exmul(const ex & lh, const ex & rh)
        // only one of the elements.
        if (rh.return_type()==return_types::commutative ||
            lh.return_type()==return_types::commutative) {
-               return (new mul(lh,rh))->setflag(status_flags::dynallocated);
+               return dynallocate<mul>(lh, rh);
        } else {
-               return (new ncmul(lh,rh))->setflag(status_flags::dynallocated);
+               return dynallocate<ncmul>(lh, rh);
        }
 }
 
 /** Used internally by operator-() and friends to change the sign of an argument. */
 static inline const ex exminus(const ex & lh)
 {
-       return (new mul(lh,_ex_1))->setflag(status_flags::dynallocated);
+       return dynallocate<mul>(lh, _ex_1);
 }
 
 // binary arithmetic operators ex with ex
@@ -247,32 +247,32 @@ const numeric operator--(numeric & lh, int)
 
 const relational operator==(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::equal);
+       return dynallocate<relational>(lh, rh, relational::equal);
 }
 
 const relational operator!=(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::not_equal);
+       return dynallocate<relational>(lh, rh, relational::not_equal);
 }
 
 const relational operator<(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::less);
+       return dynallocate<relational>(lh, rh, relational::less);
 }
 
 const relational operator<=(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::less_or_equal);
+       return dynallocate<relational>(lh, rh, relational::less_or_equal);
 }
 
 const relational operator>(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::greater);
+       return dynallocate<relational>(lh, rh, relational::greater);
 }
 
 const relational operator>=(const ex & lh, const ex & rh)
 {
-       return relational(lh,rh,relational::greater_or_equal);
+       return dynallocate<relational>(lh, rh, relational::greater_or_equal);
 }
 
 // input/output stream operators and manipulators
@@ -289,8 +289,8 @@ static void my_ios_callback(std::ios_base::event ev, std::ios_base & s, int i)
        print_context *p = static_cast<print_context *>(s.pword(i));
        if (ev == std::ios_base::erase_event) {
                delete p;
-               s.pword(i) = 0;
-       } else if (ev == std::ios_base::copyfmt_event && p != 0)
+               s.pword(i) = nullptr;
+       } else if (ev == std::ios_base::copyfmt_event && p != nullptr)
                s.pword(i) = p->duplicate();
 }