Replace dynamic throw() with static noexcept operator.

diff --git a/ginac/ex.h b/ginac/ex.h
index 0bf63a0d782e629e5b8547414d06ebc46229a5ab..e27abe502629c84236216094ca68d8601d572dc4 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -77,7 +77,7 @@ class ex {
        
        // default constructor, copy constructor and assignment operator
 public:
        
        // default constructor, copy constructor and assignment operator
 public:

-       ex() throw();
+       ex() noexcept;

 
        // other constructors
 public:
 
        // other constructors
 public:


@@ -98,7 +98,7 @@ public:
        // non-virtual functions in this class
 public:
        /** Efficiently swap the contents of two expressions. */
        // non-virtual functions in this class
 public:
        /** Efficiently swap the contents of two expressions. */

-       void swap(ex & other) throw()
+       void swap(ex & other) noexcept

        {
                GINAC_ASSERT(bp->flags & status_flags::dynallocated);
                GINAC_ASSERT(other.bp->flags & status_flags::dynallocated);
        {
                GINAC_ASSERT(bp->flags & status_flags::dynallocated);
                GINAC_ASSERT(other.bp->flags & status_flags::dynallocated);


@@ -106,12 +106,12 @@ public:
        }
 
        // iterators
        }
 
        // iterators

-       const_iterator begin() const throw();
-       const_iterator end() const throw();
+       const_iterator begin() const noexcept;
+       const_iterator end() const noexcept;

        const_preorder_iterator preorder_begin() const;
        const_preorder_iterator preorder_begin() const;

-       const_preorder_iterator preorder_end() const throw();
+       const_preorder_iterator preorder_end() const noexcept;

        const_postorder_iterator postorder_begin() const;
        const_postorder_iterator postorder_begin() const;

-       const_postorder_iterator postorder_end() const throw();
+       const_postorder_iterator postorder_end() const noexcept;

 
        // evaluation
        ex eval(int level = 0) const { return bp->eval(level); }
 
        // evaluation
        ex eval(int level = 0) const { return bp->eval(level); }


@@ -256,7 +256,7 @@ private:
 extern const basic *_num0_bp;
 
 inline
 extern const basic *_num0_bp;
 
 inline

-ex::ex() throw() : bp(*const_cast<basic *>(_num0_bp))
+ex::ex() noexcept : bp(*const_cast<basic *>(_num0_bp))

 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
 }
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
 }


@@ -358,10 +358,10 @@ class const_iterator : public std::iterator<std::random_access_iterator_tag, ex,
        friend class const_postorder_iterator;
 
 public:
        friend class const_postorder_iterator;
 
 public:

-       const_iterator() throw() {}
+       const_iterator() noexcept {}

 
 private:
 
 private:

-       const_iterator(const ex &e_, size_t i_) throw() : e(e_), i(i_) {}
+       const_iterator(const ex &e_, size_t i_) noexcept : e(e_), i(i_) {}

 
 public:
        // This should return an ex&, but that would be a reference to a
 
 public:
        // This should return an ex&, but that would be a reference to a


@@ -383,90 +383,90 @@ public:
                return e.op(i + n);
        }
 
                return e.op(i + n);
        }
 

-       const_iterator &operator++() throw()
+       const_iterator &operator++() noexcept

        {
                ++i;
                return *this;
        }
 
        {
                ++i;
                return *this;
        }
 

-       const_iterator operator++(int) throw()
+       const_iterator operator++(int) noexcept

        {
                const_iterator tmp = *this;
                ++i;
                return tmp;
        }
 
        {
                const_iterator tmp = *this;
                ++i;
                return tmp;
        }
 

-       const_iterator &operator+=(difference_type n) throw()
+       const_iterator &operator+=(difference_type n) noexcept

        {
                i += n;
                return *this;
        }
 
        {
                i += n;
                return *this;
        }
 

-       const_iterator operator+(difference_type n) const throw()
+       const_iterator operator+(difference_type n) const noexcept

        {
                return const_iterator(e, i + n);
        }
 
        {
                return const_iterator(e, i + n);
        }
 

-       inline friend const_iterator operator+(difference_type n, const const_iterator &it) throw()
+       inline friend const_iterator operator+(difference_type n, const const_iterator &it) noexcept

        {
                return const_iterator(it.e, it.i + n);
        }
 
        {
                return const_iterator(it.e, it.i + n);
        }
 

-       const_iterator &operator--() throw()
+       const_iterator &operator--() noexcept

        {
                --i;
                return *this;
        }
 
        {
                --i;
                return *this;
        }
 

-       const_iterator operator--(int) throw()
+       const_iterator operator--(int) noexcept

        {
                const_iterator tmp = *this;
                --i;
                return tmp;
        }
 
        {
                const_iterator tmp = *this;
                --i;
                return tmp;
        }
 

-       const_iterator &operator-=(difference_type n) throw()
+       const_iterator &operator-=(difference_type n) noexcept

        {
                i -= n;
                return *this;
        }
 
        {
                i -= n;
                return *this;
        }
 

-       const_iterator operator-(difference_type n) const throw()
+       const_iterator operator-(difference_type n) const noexcept

        {
                return const_iterator(e, i - n);
        }
 
        {
                return const_iterator(e, i - n);
        }
 

-       inline friend difference_type operator-(const const_iterator &lhs, const const_iterator &rhs) throw()
+       inline friend difference_type operator-(const const_iterator &lhs, const const_iterator &rhs) noexcept

        {
                return lhs.i - rhs.i;
        }
 
        {
                return lhs.i - rhs.i;
        }
 

-       bool operator==(const const_iterator &other) const throw()
+       bool operator==(const const_iterator &other) const noexcept

        {
                return are_ex_trivially_equal(e, other.e) && i == other.i;
        }
 
        {
                return are_ex_trivially_equal(e, other.e) && i == other.i;
        }
 

-       bool operator!=(const const_iterator &other) const throw()
+       bool operator!=(const const_iterator &other) const noexcept

        {
                return !(*this == other);
        }
 
        {
                return !(*this == other);
        }
 

-       bool operator<(const const_iterator &other) const throw()
+       bool operator<(const const_iterator &other) const noexcept

        {
                return i < other.i;
        }
 
        {
                return i < other.i;
        }
 

-       bool operator>(const const_iterator &other) const throw()
+       bool operator>(const const_iterator &other) const noexcept

        {
                return other < *this;
        }
 
        {
                return other < *this;
        }
 

-       bool operator<=(const const_iterator &other) const throw()
+       bool operator<=(const const_iterator &other) const noexcept

        {
                return !(other < *this);
        }
 
        {
                return !(other < *this);
        }
 

-       bool operator>=(const const_iterator &other) const throw()
+       bool operator>=(const const_iterator &other) const noexcept

        {
                return !(*this < other);
        }
        {
                return !(*this < other);
        }


@@ -481,12 +481,12 @@ namespace internal {
 struct _iter_rep {
        _iter_rep(const ex &e_, size_t i_, size_t i_end_) : e(e_), i(i_), i_end(i_end_) {}
 
 struct _iter_rep {
        _iter_rep(const ex &e_, size_t i_, size_t i_end_) : e(e_), i(i_), i_end(i_end_) {}
 

-       bool operator==(const _iter_rep &other) const throw()
+       bool operator==(const _iter_rep &other) const noexcept

        {
                return are_ex_trivially_equal(e, other.e) && i == other.i;
        }
 
        {
                return are_ex_trivially_equal(e, other.e) && i == other.i;
        }
 

-       bool operator!=(const _iter_rep &other) const throw()
+       bool operator!=(const _iter_rep &other) const noexcept

        {
                return !(*this == other);
        }
        {
                return !(*this == other);
        }


@@ -500,7 +500,7 @@ struct _iter_rep {
 
 class const_preorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
 public:
 
 class const_preorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
 public:

-       const_preorder_iterator() throw() {}
+       const_preorder_iterator() noexcept {}

 
        const_preorder_iterator(const ex &e, size_t n)
        {
 
        const_preorder_iterator(const ex &e, size_t n)
        {


@@ -531,12 +531,12 @@ public:
                return tmp;
        }
 
                return tmp;
        }
 

-       bool operator==(const const_preorder_iterator &other) const throw()
+       bool operator==(const const_preorder_iterator &other) const noexcept

        {
                return s == other.s;
        }
 
        {
                return s == other.s;
        }
 

-       bool operator!=(const const_preorder_iterator &other) const throw()
+       bool operator!=(const const_preorder_iterator &other) const noexcept

        {
                return !(*this == other);
        }
        {
                return !(*this == other);
        }


@@ -564,7 +564,7 @@ private:
 
 class const_postorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
 public:
 
 class const_postorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
 public:

-       const_postorder_iterator() throw() {}
+       const_postorder_iterator() noexcept {}

 
        const_postorder_iterator(const ex &e, size_t n)
        {
 
        const_postorder_iterator(const ex &e, size_t n)
        {


@@ -596,12 +596,12 @@ public:
                return tmp;
        }
 
                return tmp;
        }
 

-       bool operator==(const const_postorder_iterator &other) const throw()
+       bool operator==(const const_postorder_iterator &other) const noexcept

        {
                return s == other.s;
        }
 
        {
                return s == other.s;
        }
 

-       bool operator!=(const const_postorder_iterator &other) const throw()
+       bool operator!=(const const_postorder_iterator &other) const noexcept

        {
                return !(*this == other);
        }
        {
                return !(*this == other);
        }


@@ -629,12 +629,12 @@ private:
        }
 };
 
        }
 };
 

-inline const_iterator ex::begin() const throw()
+inline const_iterator ex::begin() const noexcept

 {
        return const_iterator(*this, 0);
 }
 
 {
        return const_iterator(*this, 0);
 }
 

-inline const_iterator ex::end() const throw()
+inline const_iterator ex::end() const noexcept

 {
        return const_iterator(*this, nops());
 }
 {
        return const_iterator(*this, nops());
 }


@@ -644,7 +644,7 @@ inline const_preorder_iterator ex::preorder_begin() const
        return const_preorder_iterator(*this, nops());
 }
 
        return const_preorder_iterator(*this, nops());
 }
 

-inline const_preorder_iterator ex::preorder_end() const throw()
+inline const_preorder_iterator ex::preorder_end() const noexcept

 {
        return const_preorder_iterator();
 }
 {
        return const_preorder_iterator();
 }


@@ -654,7 +654,7 @@ inline const_postorder_iterator ex::postorder_begin() const
        return const_postorder_iterator(*this, nops());
 }
 
        return const_postorder_iterator(*this, nops());
 }
 

-inline const_postorder_iterator ex::postorder_end() const throw()
+inline const_postorder_iterator ex::postorder_end() const noexcept

 {
        return const_postorder_iterator();
 }
 {
        return const_postorder_iterator();
 }

diff --git a/ginac/ptr.h b/ginac/ptr.h
index c5316cc08d5fea705a3a826c7576f94a1b67ee55..5911dd675cb4efd07c1252380b00b078e00c2a7d 100644 (file)
--- a/ginac/ptr.h
+++ b/ginac/ptr.h
@@ -34,12 +34,12 @@ namespace GiNaC {
 /** Base class for reference-counted objects. */
 class refcounted {
 public:
 /** 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
 
 private:
        unsigned int refcount; ///< reference counter


@@ -64,12 +64,12 @@ public:
     // no default ctor: a ptr is never unbound
 
        /** Bind ptr to newly created object, start reference counting. */
     // 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. */
 
        /** 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()
        {
 
        ~ptr()
        {


@@ -90,10 +90,10 @@ public:
                return *this;
        }
 
                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. */
 
        /** 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. */
        }
 
        /** 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;
        {
                T *t = p;
                p = other.p;


@@ -121,22 +121,22 @@ public:
        // to different (probably derived) types and raw pointers.
 
        template <class U>
        // 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>
 
        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>
 
        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>
 
        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>
 
        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>
 
        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)
        {
 
        inline friend std::ostream & operator<<(std::ostream & os, const ptr<T> & rhs)
        {