obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 32 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist2.C b/gcc/testsuite/g++.dg/cpp0x/initlist2.C
new file mode 100644
index 000000000..2fe477056
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist2.C
@@ -0,0 +1,32 @@
+// Test that conversion to std::initializer_list takes priority over other
+// user-defined conversions.
+
+// { dg-do link }
+// { dg-options "-std=c++0x" }
+
+#include <initializer_list>
+
+struct string
+{
+  string (const char *) {}
+  template <class Iter> string (Iter, Iter);
+};
+  
+template <class T, class U>
+struct pair
+{
+  pair (T t, U u) {}
+};
+
+template<class T, class U>
+struct map
+{
+  void insert (pair<T,U>);
+  void insert (std::initializer_list<pair<T,U> >) {}
+};
+
+int main()
+{
+  map<string,string> m;
+  m.insert({ {"this","that"}, {"me","you"} });
+}