From 5677e1d4e4c94261413f59b241f8c8191566e8bb Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 4 May 2012 18:09:02 +0200 Subject: [PATCH] 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 --- t/objcxx-deps.sh | 3 +-- t/objcxx-minidemo.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 -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 #import -using namespace std; int main (void) { - cout << "Success (" << PACKAGE_STRING << ")\n"; + std::cout << "Success (" << PACKAGE_STRING << ")\n"; return 0; } END -- 2.47.2