diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/rtl.h | 1 | ||||
| -rw-r--r-- | gcc/system.h | 2 | ||||
| -rw-r--r-- | gcc/tree-vect-data-refs.c | 14 | ||||
| -rw-r--r-- | gcc/wide-int.h | 2 |
5 files changed, 13 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f86c51b..2f6582d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-11-11 Uros Bizjak <ubizjak@gmail.com> + + * system.h: Include algorithm and utility. + * rtl.h: Do not include utility here. + * wide-int.h: Ditto. + * tree-vect-data-refs.c (swap): Remove template. + (vect_prune_runtime_alias_test_list): Use std::swap instead of swap. + 2014-11-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR bootstrap/63699 @@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_RTL_H #define GCC_RTL_H -#include <utility> #include "statistics.h" #include "machmode.h" #include "input.h" diff --git a/gcc/system.h b/gcc/system.h index c05f02d..58f50f1 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -215,7 +215,9 @@ extern int errno; #endif #ifdef __cplusplus +# include <algorithm> # include <cstring> +# include <utility> #endif /* Some of glibc's string inlines cause warnings. Plus we'd rather diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 0bc0356..c49b47c 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -2718,14 +2718,6 @@ comp_dr_with_seg_len_pair (const void *p1_, const void *p2_) return 0; } -template <class T> static void -swap (T& a, T& b) -{ - T c (a); - a = b; - b = c; -} - /* Function vect_vfa_segment_size. Create an expression that computes the size of segment @@ -2858,7 +2850,7 @@ vect_prune_runtime_alias_test_list (loop_vec_info loop_vinfo) dr_with_seg_len (dr_b, segment_length_b)); if (compare_tree (DR_BASE_ADDRESS (dr_a), DR_BASE_ADDRESS (dr_b)) > 0) - swap (dr_with_seg_len_pair.first, dr_with_seg_len_pair.second); + std::swap (dr_with_seg_len_pair.first, dr_with_seg_len_pair.second); comp_alias_ddrs.safe_push (dr_with_seg_len_pair); } @@ -2908,8 +2900,8 @@ vect_prune_runtime_alias_test_list (loop_vec_info loop_vinfo) and DR_A1 and DR_A2 are two consecutive memrefs. */ if (*dr_a1 == *dr_a2) { - swap (dr_a1, dr_b1); - swap (dr_a2, dr_b2); + std::swap (dr_a1, dr_b1); + std::swap (dr_a2, dr_b2); } if (!operand_equal_p (DR_BASE_ADDRESS (dr_a1->dr), diff --git a/gcc/wide-int.h b/gcc/wide-int.h index 00c7d6e..f5735d8 100644 --- a/gcc/wide-int.h +++ b/gcc/wide-int.h @@ -216,8 +216,6 @@ along with GCC; see the file COPYING3. If not see the same result as X + X; the precision of the shift amount Y can be arbitrarily different from X. */ - -#include <utility> #include "system.h" #include "hwint.h" #include "signop.h" |