MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

one constructor had three compile errors, just commented it out

develop
mizipzor 2010-02-19 20:51:33 +01:00
parent c8b9c36d36
commit 34f7894255
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
library/argstream/argstream.h
Unescape Escape View File

@ -218,7 +218,7 @@ namespace
{ {
public: public:
inline argstream(int argc,char** argv); inline argstream(int argc,char** argv);
inline argstream(const char* c); //inline argstream(const char* c);
template<class T> template<class T>
friend argstream& operator>>(argstream& s,const ValueHolder<T>& v); friend argstream& operator>>(argstream& s,const ValueHolder<T>& v);
friend inline argstream& operator>>(argstream& s,const OptionHolder& v); friend inline argstream& operator>>(argstream& s,const OptionHolder& v);
@ -408,34 +408,34 @@ namespace
{ {
parse(argc,argv); parse(argc,argv);
} }
inline //inline
argstream::argstream(const char* c) // argstream::argstream(const char* c)
: progName_(""), // : progName_(""),
minusActive_(true), // minusActive_(true),
isOk_(true) // isOk_(true)
{ //{
std::string s(c); // std::string s(c);
// Build argc, argv from s. We must add a dummy first element for // // Build argc, argv from s. We must add a dummy first element for
// progName because parse() expects it!! // // progName because parse() expects it!!
std::deque<std::string> args; // std::deque<std::string> args;
args.push_back(""); // args.push_back("");
std::istringstream is(s); // std::istringstream is(s);
while (is.good()) // while (is.good())
{ // {
std::string t; // std::string t;
is>>t; // is>>t;
args.push_back(t); // args.push_back(t);
} // }
char* pargs[args.size()]; // char* pargs[args.size()];
char** p = pargs; // char** p = pargs;
for (std::deque<std::string>::const_iterator // for (std::deque<std::string>::const_iterator
iter = args.begin(); // iter = args.begin();
iter != args.end();++iter) // iter != args.end();++iter)
{ // {
*p++ = const_cast<char*>(iter->c_str()); // *p++ = const_cast<char*>(iter->c_str());
} // }
parse(args.size(),pargs); // parse(args.size(),pargs);
} //}
inline void inline void
argstream::parse(int argc,char** argv) argstream::parse(int argc,char** argv)
{ {