From: Richard Kreckel Date: Tue, 5 Jun 2001 21:07:04 +0000 (+0000) Subject: - inserted a couple of missing namepace std:: resolutions. X-Git-Tag: release_0-9-0~14 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=1c366ae20b00440baee6c3a11b2a109294f236b9;ds=sidebyside - inserted a couple of missing namepace std:: resolutions. --- diff --git a/ginac/color.cpp b/ginac/color.cpp index 92f890a5..adcd8740 100644 --- 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 ita(a); + std::back_insert_iterator 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 a2eda2c4..90e3d4c3 100644 --- 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 { +struct idx_is_not : public std::binary_function { 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 ac7aecdf..ae972254 100644 --- 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 { +struct ex_is_less : public std::binary_function { bool operator() (const ex &lh, const ex &rh) const { return lh.compare(rh) < 0; } }; -struct ex_is_equal : public binary_function { +struct ex_is_equal : public std::binary_function { bool operator() (const ex &lh, const ex &rh) const { return lh.is_equal(rh); } };