From 7811354d92631217ea97b6f639eb357df532e640 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Fri, 29 May 2015 23:22:20 +0200 Subject: [PATCH] Move iostream inclusion in zm.h and declare explicitely the namespace for cout --- src/zm.h | 2 ++ src/zm_image_analyser.h | 1 - src/zma.cpp | 2 +- src/zmc.cpp | 2 +- src/zmf.cpp | 2 +- src/zmstreamer.cpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/zm.h b/src/zm.h index be2882f8d..a60ab655d 100644 --- a/src/zm.h +++ b/src/zm.h @@ -33,6 +33,8 @@ #include +#include + extern const char* self; #endif // ZM_H diff --git a/src/zm_image_analyser.h b/src/zm_image_analyser.h index d1d0c1da0..74cc7a73a 100644 --- a/src/zm_image_analyser.h +++ b/src/zm_image_analyser.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include "zm.h" diff --git a/src/zma.cpp b/src/zma.cpp index cb6ddb4e8..e45327cc1 100644 --- a/src/zma.cpp +++ b/src/zma.cpp @@ -70,7 +70,7 @@ int main( int argc, char *argv[] ) Usage(); break; case 'v': - cout << ZM_VERSION << "\n"; + std::cout << ZM_VERSION << "\n"; exit(0); default: //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c ); diff --git a/src/zmc.cpp b/src/zmc.cpp index e97f0054f..5be5ed8af 100644 --- a/src/zmc.cpp +++ b/src/zmc.cpp @@ -115,7 +115,7 @@ int main( int argc, char *argv[] ) Usage(); break; case 'v': - cout << ZM_VERSION << "\n"; + std::cout << ZM_VERSION << "\n"; exit(0); default: //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c ); diff --git a/src/zmf.cpp b/src/zmf.cpp index d97a9e5d5..94bd0bdb5 100644 --- a/src/zmf.cpp +++ b/src/zmf.cpp @@ -138,7 +138,7 @@ int main( int argc, char *argv[] ) Usage(); break; case 'v': - cout << ZM_VERSION << "\n"; + std::cout << ZM_VERSION << "\n"; exit(0); default: //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c ); diff --git a/src/zmstreamer.cpp b/src/zmstreamer.cpp index 5c11cfbea..7385accca 100644 --- a/src/zmstreamer.cpp +++ b/src/zmstreamer.cpp @@ -102,7 +102,7 @@ int main(int argc, char** argv) { printf("-v : This installed version of ZoneMinder\n"); return EXIT_SUCCESS; case 'v': - cout << ZM_VERSION << "\n"; + std::cout << ZM_VERSION << "\n"; exit(0); } }