diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
| commit | 43269d882367dc4f0e4c2651d6625e1b7de78764 (patch) | |
| tree | 6aaf525a6fb8a4fb63a71c9ca56be58bc1d6655b /libstdc++-v3/testsuite/23_containers/unordered_map | |
| parent | ce97ec0e268b7b50b9f801dd12ffc67042c47193 (diff) | |
| parent | 48dc1117de124a2265129a36bfbbc211522c2c02 (diff) | |
| download | gcc-43269d882367dc4f0e4c2651d6625e1b7de78764.tar.gz | |
Merge remote-tracking branch 'origin/gcc-4_7-branch' into hjl/tsx/gcc-4_7-branchhjl/tsx/gcc-4_7-branch
Conflicts:
gcc/config/i386/driver-i386.c
gcc/config/i386/i386.c
gcc/config/i386/sync.md
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/unordered_map')
5 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/final_hash.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/final_hash.cc index c509a34afee..d651732a66f 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/final_hash.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/final_hash.cc @@ -10,7 +10,7 @@ // any later version. // This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/observers.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/observers.cc index 4a6847e5c0b..089cf512d99 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/observers.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/observers.cc @@ -10,7 +10,7 @@ // any later version. // This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc index b41b6a5b3ee..1555c48963c 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc @@ -10,7 +10,7 @@ // any later version. // This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc index bf05fab0d28..c75ed9b09aa 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc @@ -10,7 +10,7 @@ // any later version. // This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc index 704f5998c0d..ed05d208f5b 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc @@ -10,7 +10,7 @@ // any later version. // This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. |