Move iostream inclusion in zm.h and declare explicitely the namespace for cout
This commit is contained in:
parent
a64182b45c
commit
7811354d92
2
src/zm.h
2
src/zm.h
|
@ -33,6 +33,8 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
extern const char* self;
|
||||
|
||||
#endif // ZM_H
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include <list>
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
||||
#include "zm.h"
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue