- inserted a couple of missing namepace std:: resolutions.

diff --git a/ginac/color.cpp b/ginac/color.cpp
index 92f890a5f25a4764368a72d606e413dfa8f30a98..adcd8740f2ab7686a7babde2ca6a493cfa998394 100644 (file)
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -371,7 +371,7 @@ bool su3d::contract_with(exvector::iterator self, exvector::iterator other, exve
                // d.akl d.bkl = 5/3 delta.ab
                } else if (dummy_indices.size() == 2) {
                        exvector a;
-                       back_insert_iterator<exvector> ita(a);
+                       std::back_insert_iterator<exvector> ita(a);
                        ita = set_difference(self_indices.begin(), self_indices.end(), dummy_indices.begin(), dummy_indices.end(), ita, ex_is_less());
                        ita = set_difference(other_indices.begin(), other_indices.end(), dummy_indices.begin(), dummy_indices.end(), ita, ex_is_less());
                        GINAC_ASSERT(a.size() == 2);

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index a2eda2c482b1621e7a94798a5db3ebece9ffbff4..90e3d4c361b049ab016483c074c48f8b13658189 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -226,7 +226,7 @@ bool indexed::info(unsigned inf) const
        return inherited::info(inf);
 }
 
-struct idx_is_not : public binary_function<ex, unsigned, bool> {
+struct idx_is_not : public std::binary_function<ex, unsigned, bool> {
        bool operator() (const ex & e, unsigned inf) const {
                return !(ex_to_idx(e).get_value().info(inf));
        }

diff --git a/ginac/utils.h b/ginac/utils.h
index ac7aecdfacf5a128fd1aa73f238f5d42cd065fa4..ae972254c04f36b687d4b73fd2498353ce4255fa 100644 (file)
--- a/ginac/utils.h
+++ b/ginac/utils.h
@@ -147,7 +147,7 @@ int permutation_sign(It first, It last)
                bool swapped = false;
                while (i != first) {
                        if (*i < *other) {
-                               iter_swap(other, i);
+                               std::iter_swap(other, i);
                                flag = other;
                                swapped = true;
                                sign = -sign;
@@ -166,7 +166,7 @@ int permutation_sign(It first, It last)
                swapped = false;
                while (i != last) {
                        if (*other < *i) {
-                               iter_swap(i, other);
+                               std::iter_swap(i, other);
                                flag = other;
                                swapped = true;
                                sign = -sign;
@@ -200,7 +200,7 @@ int permutation_sign(It first, It last, Cmp comp)
                bool swapped = false;
                while (i != first) {
                        if (comp(*i, *other)) {
-                               iter_swap(other, i);
+                               std::iter_swap(other, i);
                                flag = other;
                                swapped = true;
                                sign = -sign;
@@ -219,7 +219,7 @@ int permutation_sign(It first, It last, Cmp comp)
                swapped = false;
                while (i != last) {
                        if (comp(*other, *i)) {
-                               iter_swap(i, other);
+                               std::iter_swap(i, other);
                                flag = other;
                                swapped = true;
                                sign = -sign;
@@ -253,7 +253,7 @@ void shaker_sort(It first, It last, Cmp comp)
                bool swapped = false;
                while (i != first) {
                        if (comp(*i, *other)) {
-                               iter_swap(other, i);
+                               std::iter_swap(other, i);
                                flag = other;
                                swapped = true;
                        }
@@ -270,7 +270,7 @@ void shaker_sort(It first, It last, Cmp comp)
                swapped = false;
                while (i != last) {
                        if (comp(*other, *i)) {
-                               iter_swap(i, other);
+                               std::iter_swap(i, other);
                                flag = other;
                                swapped = true;
                        }
@@ -284,11 +284,11 @@ void shaker_sort(It first, It last, Cmp comp)
 }
 
 /* Function objects for STL sort() etc. */
-struct ex_is_less : public binary_function<ex, ex, bool> {
+struct ex_is_less : public std::binary_function<ex, ex, bool> {
        bool operator() (const ex &lh, const ex &rh) const { return lh.compare(rh) < 0; }
 };
 
-struct ex_is_equal : public binary_function<ex, ex, bool> {
+struct ex_is_equal : public std::binary_function<ex, ex, bool> {
        bool operator() (const ex &lh, const ex &rh) const { return lh.is_equal(rh); }
 };