projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r283: Rename if-1,if-2 to if1, if2
[ctsim.git]
/
tools
/
pjinfo.cpp
diff --git
a/tools/pjinfo.cpp
b/tools/pjinfo.cpp
index 265a9fecd6539c8633dc69234e35695dfb34d2ab..d5086b9bfe5601f9e01b7c6b7365b3288b6510cb 100644
(file)
--- a/
tools/pjinfo.cpp
+++ b/
tools/pjinfo.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: pjinfo.cpp,v 1.
3 2000/12/16 07:28:25
kevin Exp $
+** $Id: pjinfo.cpp,v 1.
4 2000/12/17 22:30:34
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-50,7
+50,7
@@
static struct option my_options[] =
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-static const char* g_szIdStr = "$Id: pjinfo.cpp,v 1.
3 2000/12/16 07:28:25
kevin Exp $";
+static const char* g_szIdStr = "$Id: pjinfo.cpp,v 1.
4 2000/12/17 22:30:34
kevin Exp $";
void
pjinfo_usage (const char *program)
void
pjinfo_usage (const char *program)
@@
-102,7
+102,7
@@
pjinfo_main (const int argc, char *const argv[])
optStartView = strtol(optarg, &endptr, 10);
endstr = optarg + strlen(optarg);
if (endptr != endstr) {
optStartView = strtol(optarg, &endptr, 10);
endstr = optarg + strlen(optarg);
if (endptr != endstr) {
- cerr << "Error setting --startview to %s" << optarg << std::endl;
+
std::
cerr << "Error setting --startview to %s" << optarg << std::endl;
pjinfo_usage(argv[0]);
return (1);
}
pjinfo_usage(argv[0]);
return (1);
}
@@
-111,7
+111,7
@@
pjinfo_main (const int argc, char *const argv[])
optEndView = strtol(optarg, &endptr, 10);
endstr = optarg + strlen(optarg);
if (endptr != endstr) {
optEndView = strtol(optarg, &endptr, 10);
endstr = optarg + strlen(optarg);
if (endptr != endstr) {
- cerr << "Error setting --endview to %s" << optarg << std::endl;
+
std::
cerr << "Error setting --endview to %s" << optarg << std::endl;
pjinfo_usage(argv[0]);
return (1);
}
pjinfo_usage(argv[0]);
return (1);
}
@@
-173,9
+173,9
@@
main (const int argc, char *const argv[])
try {
retval = pjinfo_main(argc, argv);
} catch (exception e) {
try {
retval = pjinfo_main(argc, argv);
} catch (exception e) {
- cerr << "Exception: " << e.what() << std::endl;
+
std::
cerr << "Exception: " << e.what() << std::endl;
} catch (...) {
} catch (...) {
- cerr << "Unknown exception\n";
+
std::
cerr << "Unknown exception\n";
}
return (retval);
}
return (retval);