Move iostream inclusion in zm.h and declare explicitely the namespace for cout

This commit is contained in:
Emmanuel Papin 2015-05-29 23:22:20 +02:00
parent a64182b45c
commit 7811354d92
6 changed files with 6 additions and 5 deletions

View File

@ -33,6 +33,8 @@
#include <stdint.h>
#include <iostream>
extern const char* self;
#endif // ZM_H

View File

@ -6,7 +6,6 @@
#include <list>
#include <string>
#include <stdexcept>
#include <iostream>
#include <memory>
#include "zm.h"

View File

@ -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 );

View File

@ -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 );

View File

@ -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 );

View File

@ -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);
}
}