Merge fixes for #1455.

[SVN r41972]
This commit is contained in:
John Maddock
2007-12-11 17:26:26 +00:00
parent 97daf0f81f
commit a159bacf3f
3 changed files with 3 additions and 3 deletions

View File

@ -47,7 +47,7 @@ istream& getline(istream& is, std::string& s)
#endif
int main(int argc)
int main(int argc, const char*[])
{
string s;
list<string> l;