Remove iter_swap specializations.

[ginac.git] / ginac / utils.h

diff --git a/ginac/utils.h b/ginac/utils.h
index c5d7e03d40bee0c9213c02524e0915f11cc0aa78..692c731453fa371f699767f0fa7f7d972d3889bd 100644 (file)
--- a/ginac/utils.h
+++ b/ginac/utils.h
@@ -4,7 +4,7 @@
  *  of any interest to the user of the library. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -21,20 +21,19 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_UTILS_H__
-#define __GINAC_UTILS_H__
+#ifndef GINAC_UTILS_H
+#define GINAC_UTILS_H
 
+#include "assertion.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <string>
 #include <functional>
 #ifdef HAVE_STDINT_H
 #include <stdint.h> // for uintptr_t
 #endif
-
-#include "assertion.h"
+#include <string>
 
 namespace GiNaC {
 
@@ -50,7 +49,7 @@ class dunno {};
 unsigned log2(unsigned n);
 
 /** Rotate bits of unsigned value by one bit to the left.
-  * This can be necesary if the user wants to define its own hashes. */
+  * This can be necessary if the user wants to define its own hashes. */
 inline unsigned rotate_left(unsigned n)
 {
        return (n & 0x80000000U) ? (n << 1 | 0x00000001U) : (n << 1);
@@ -109,6 +108,7 @@ inline unsigned golden_ratio_hash(p_int n)
 template <class It>
 int permutation_sign(It first, It last)
 {
+       using std::swap;
        if (first == last)
                return 0;
        --last;
@@ -123,13 +123,15 @@ int permutation_sign(It first, It last)
                bool swapped = false;
                while (i != first) {
                        if (*i < *other) {
-                               std::iter_swap(other, i);
+                               swap(*other, *i);
                                flag = other;
                                swapped = true;
                                sign = -sign;
                        } else if (!(*other < *i))
                                return 0;
-                       --i; --other;
+                       --i;
+                       if (i != first)
+                               --other;
                }
                if (!swapped)
                        return sign;
@@ -142,13 +144,15 @@ int permutation_sign(It first, It last)
                swapped = false;
                while (i != last) {
                        if (*other < *i) {
-                               std::iter_swap(i, other);
+                               swap(*i, *other);
                                flag = other;
                                swapped = true;
                                sign = -sign;
                        } else if (!(*i < *other))
                                return 0;
-                       ++i; ++other;
+                       ++i;
+                       if (i != last)
+                               ++other;
                }
                if (!swapped)
                        return sign;
@@ -182,7 +186,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit)
                                sign = -sign;
                        } else if (!comp(*other, *i))
                                return 0;
-                       --i; --other;
+                       --i;
+                       if (i != first)
+                               --other;
                }
                if (!swapped)
                        return sign;
@@ -201,7 +207,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit)
                                sign = -sign;
                        } else if (!comp(*i, *other))
                                return 0;
-                       ++i; ++other;
+                       ++i; 
+                       if (i != last)
+                               ++other;
                }
                if (!swapped)
                        return sign;
@@ -233,7 +241,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit)
                                flag = other;
                                swapped = true;
                        }
-                       --i; --other;
+                       --i;
+                       if (i != first)
+                               --other;
                }
                if (!swapped)
                        return;
@@ -250,7 +260,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit)
                                flag = other;
                                swapped = true;
                        }
-                       ++i; ++other;
+                       ++i;
+                       if (i != last)
+                               ++other;
                }
                if (!swapped)
                        return;
@@ -407,20 +419,6 @@ extern const ex _ex120;
 #define DEFAULT_CTOR(classname) \
 classname::classname() { setflag(status_flags::evaluated | status_flags::expanded); }
 
-#define DEFAULT_UNARCHIVE(classname) \
-ex classname::unarchive(const archive_node &n, lst &sym_lst) \
-{ \
-       return (new classname(n, sym_lst))->setflag(status_flags::dynallocated); \
-}
-
-#define DEFAULT_ARCHIVING(classname) \
-classname::classname(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {} \
-DEFAULT_UNARCHIVE(classname) \
-void classname::archive(archive_node &n) const \
-{ \
-       inherited::archive(n); \
-}
-
 #define DEFAULT_COMPARE(classname) \
 int classname::compare_same_type(const basic & other) const \
 { \
@@ -443,5 +441,4 @@ void classname::do_print_latex(const print_latex & c, unsigned level) const \
 
 } // namespace GiNaC
 
-
-#endif // ndef __GINAC_UTILS_H__
+#endif // ndef GINAC_UTILS_H