Merge bug fixes from Trunk - see history for full details.

[SVN r58234]
This commit is contained in:
John Maddock committed 2009-12-08 12:42:33 +00:00
1 parent 95ddff1f01
commit ae79f29895
133 files changed
+1893 -933

No files matched your search

+2 -2
View File
@@ -55,11 +55,11 @@ int process_ftp(const char* response, std::string* msg)
istream& getline(istream& is, std::string& s)
{
s.erase();
char c = is.get();
char c = static_cast<char>(is.get());
while(c != '\n')
{
s.append(1, c);
c = is.get();
c = static_cast<char>(is.get());
}
return is;
}