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, 19 insertions, 0 deletions

diff --git a/gcc/testsuite/obj-c++.dg/cxx-scope-2.mm b/gcc/testsuite/obj-c++.dg/cxx-scope-2.mm
new file mode 100644
index 000000000..c793b282f
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/cxx-scope-2.mm
@@ -0,0 +1,19 @@
+/* Make sure Objective-C++ can distinguish ObjC classes from C++ classes.  */
+/* Author: Ziemowit Laski  <zlaski@apple.com> */
+
+/* { dg-do compile } */
+
+#include "../objc-obj-c++-shared/Object1.h"
+#include <iostream>
+#include <string>
+
+@interface iostream: Object
+@end
+
+int main(void) {
+  id i = [std::iostream new];  /* { dg-error "not an Objective\\-C class name or alias" } */
+  i = [iostream new];
+  i = [std::basic_string<char> new];  /* { dg-error "not an Objective\\-C class name or alias" } */
+
+  return 0;
+}