Happy New Year!

[ginac.git] / ginac / ptr.h

diff --git a/ginac/ptr.h b/ginac/ptr.h
index 07d7497dec6257b13c68d7d75f63ddc2c18f60e8..baf0f991c15271c25a0d1a4ad5c7d4d5b40d8e6c 100644 (file)
--- a/ginac/ptr.h
+++ b/ginac/ptr.h
@@ -3,7 +3,7 @@
  *  Reference-counted pointer template. */
 
 /*
- *  GiNaC Copyright (C) 1999-2014 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
@@ -34,12 +34,12 @@ namespace GiNaC {
 /** Base class for reference-counted objects. */
 class refcounted {
 public:
-       refcounted() throw() : refcount(0) {}
+       refcounted() noexcept : refcount(0) {}
 
-       unsigned int add_reference() throw() { return ++refcount; }
-       unsigned int remove_reference() throw() { return --refcount; }
-       unsigned int get_refcount() const throw() { return refcount; }
-       void set_refcount(unsigned int r) throw() { refcount = r; }
+       unsigned int add_reference() noexcept { return ++refcount; }
+       unsigned int remove_reference() noexcept { return --refcount; }
+       unsigned int get_refcount() const noexcept { return refcount; }
+       void set_refcount(unsigned int r) noexcept { refcount = r; }
 
 private:
        unsigned int refcount; ///< reference counter
@@ -54,22 +54,22 @@ private:
  *      from refcounted)
  *    T* T::duplicate() member function (only if makewriteable() is used) */
 template <class T> class ptr {
-       friend class std::less< ptr<T> >;
+       friend struct std::less<ptr<T>>;
 
        // NB: This implementation of reference counting is not thread-safe.
        // The reference counter needs to be incremented/decremented atomically,
        // and makewritable() requires locking.
 
 public:
-    // no default ctor: a ptr is never unbound
+       // no default ctor: a ptr is never unbound
 
        /** Bind ptr to newly created object, start reference counting. */
-       ptr(T *t) throw() : p(t) { GINAC_ASSERT(p); p->set_refcount(1); }
+       ptr(T *t) noexcept : p(t) { GINAC_ASSERT(p); p->set_refcount(1); }
 
        /** Bind ptr to existing reference-counted object. */
-       explicit ptr(T &t) throw() : p(&t) { p->add_reference(); }
+       explicit ptr(T &t) noexcept : p(&t) { p->add_reference(); }
 
-       ptr(const ptr & other) throw() : p(other.p) { p->add_reference(); }
+       ptr(const ptr & other) noexcept : p(other.p) { p->add_reference(); }
 
        ~ptr()
        {
@@ -90,10 +90,10 @@ public:
                return *this;
        }
 
-       T &operator*() const throw() { return *p; }
-       T *operator->() const throw() { return p; }
+       T &operator*() const noexcept { return *p; }
+       T *operator->() const noexcept { return p; }
 
-       friend inline T *get_pointer(const ptr & x) throw() { return x.p; }
+       friend inline T *get_pointer(const ptr & x) noexcept { return x.p; }
 
        /** Announce your intention to modify the object bound to this ptr.
         *  This ensures that the object is not shared by any other ptrs. */
@@ -108,7 +108,7 @@ public:
        }
 
        /** Swap the bound object of this ptr with another ptr. */
-       void swap(ptr & other) throw()
+       void swap(ptr & other) noexcept
        {
                T *t = p;
                p = other.p;
@@ -121,22 +121,22 @@ public:
        // to different (probably derived) types and raw pointers.
 
        template <class U>
-       bool operator==(const ptr<U> & rhs) const throw() { return p == get_pointer(rhs); }
+       bool operator==(const ptr<U> & rhs) const noexcept { return p == get_pointer(rhs); }
 
        template <class U>
-       bool operator!=(const ptr<U> & rhs) const throw() { return p != get_pointer(rhs); }
+       bool operator!=(const ptr<U> & rhs) const noexcept { return p != get_pointer(rhs); }
 
        template <class U>
-       inline friend bool operator==(const ptr & lhs, const U * rhs) throw() { return lhs.p == rhs; }
+       inline friend bool operator==(const ptr & lhs, const U * rhs) noexcept { return lhs.p == rhs; }
 
        template <class U>
-       inline friend bool operator!=(const ptr & lhs, const U * rhs) throw() { return lhs.p != rhs; }
+       inline friend bool operator!=(const ptr & lhs, const U * rhs) noexcept { return lhs.p != rhs; }
 
        template <class U>
-       inline friend bool operator==(const U * lhs, const ptr & rhs) throw() { return lhs == rhs.p; }
+       inline friend bool operator==(const U * lhs, const ptr & rhs) noexcept { return lhs == rhs.p; }
 
        template <class U>
-       inline friend bool operator!=(const U * lhs, const ptr & rhs) throw() { return lhs != rhs.p; }
+       inline friend bool operator!=(const U * lhs, const ptr & rhs) noexcept { return lhs != rhs.p; }
 
        inline friend std::ostream & operator<<(std::ostream & os, const ptr<T> & rhs)
        {
@@ -155,8 +155,7 @@ namespace std {
 
 /** Specialization of std::less for ptr<T> to enable ordering of ptr<T>
  *  objects (e.g. for the use as std::map keys). */
-template <class T> struct less< GiNaC::ptr<T> >
- : public binary_function<GiNaC::ptr<T>, GiNaC::ptr<T>, bool> {
+template <class T> struct less<GiNaC::ptr<T>> {
        bool operator()(const GiNaC::ptr<T> &lhs, const GiNaC::ptr<T> &rhs) const
        {
                return less<T*>()(lhs.p, rhs.p);