diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2018-07-09 16:12:27 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2018-07-09 16:12:27 -0700 |
| commit | c3c5e486808bc473d1642bb4ba84d80689c8fca2 (patch) | |
| tree | 4019a62cfe570b9faaa39060b57dcca616d4cdd0 /gold | |
| parent | 8d4c0995eb0996fdbc0ee490317e3765a94723d7 (diff) | |
| download | binutils-c3c5e486808bc473d1642bb4ba84d80689c8fca2.zip binutils-c3c5e486808bc473d1642bb4ba84d80689c8fca2.tar.gz binutils-c3c5e486808bc473d1642bb4ba84d80689c8fca2.tar.bz2 | |
Fix test for availability of emplace_back.
Testing for the GCC version 5 or later isn't right, since C++ 11 support
wasn't enabled by default until later. This patch tests the C++ standard
support directly instead of inferring it from the GCC version.
gold/
* incremental.cc (Sized_incremental_binary::setup_readers): Use
emplace_back for C++ 11 or later.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/incremental.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 83df3d8..eeb19e7 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2018-07-09 Cary Coutant <ccoutant@gmail.com> + + * incremental.cc (Sized_incremental_binary::setup_readers): Use + emplace_back for C++ 11 or later. + 2018-07-06 Alan Modra <amodra@gmail.com> * powerpc.cc: Include attributes.h. diff --git a/gold/incremental.cc b/gold/incremental.cc index 7558d14..1199fe0 100644 --- a/gold/incremental.cc +++ b/gold/incremental.cc @@ -311,10 +311,10 @@ Sized_incremental_binary<size, big_endian>::setup_readers() for (unsigned int i = 0; i < count; i++) { Input_entry_reader input_file = inputs.input_file(i); -#if defined(__GNUC__) && __GNUC__ < 5 - this->input_entry_readers_.push_back(Sized_input_reader(input_file)); -#else +#if __cplusplus >= 2001103L this->input_entry_readers_.emplace_back(input_file); +#else + this->input_entry_readers_.push_back(Sized_input_reader(input_file)); #endif switch (input_file.type()) { |