From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 4 May 2012 16:09:02 +0000 (+0200)
Subject: maintcheck: avoid a couple of spurious failures
X-Git-Tag: v1.12.0b~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5677e1d4e4c94261413f59b241f8c8191566e8bb;p=thirdparty%2Fautomake.git

maintcheck: avoid a couple of spurious failures

* t/objcxx-deps.sh, t/objcxx-minidemo.sh: In C++ files, use
"std::cout <<", not "cout <<", to avoid triggering a spurious
failure by the syntax check 'sc_tests_here_document_format'.

Cherry-picked from yesterday's commit v1.12-81-g7f3f467, that
had erroneously been applied to 'master' only rather than to
'maint'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index 24665cca1..782193ac7 100755
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
@@ -33,7 +33,6 @@ END
 
 cat > baz.h++ << 'END'
 #include <iostream>
-using namespace std;
 #include "baz2.hh"
 END
 
@@ -46,7 +45,7 @@ cat > bar.mm << 'END'
 #import "baz.h++"
 int main (void)
 {
-    cout << MSG << "\n";
+    std::cout << MSG << "\n";
     return 0;
 }
 END
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index fe93ea6fd..74e152c1c 100755
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
@@ -40,10 +40,9 @@ cat > ok.mm << 'END'
 /* The use of #import makes this valid Object C++ but invalid C++. */
 #import <iostream>
 #import <config.h>
-using namespace std;
 int main (void)
 {
-    cout << "Success (" << PACKAGE_STRING << ")\n";
+    std::cout << "Success (" << PACKAGE_STRING << ")\n";
     return 0;
 }
 END