generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

integrated changes from main repository

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-12-27 15:16:22 +00:00
parent 13f73441e2
commit d9d531350d
9 changed files with 113 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Foundation/src/Format.cpp
View File

@@ -1,7 +1,7 @@
//
// Format.cpp
//
// $Id: //poco/1.3/Foundation/src/Format.cpp#1 $
// $Id: //poco/1.3/Foundation/src/Format.cpp#2 $
//
// Library: Foundation
// Package: Core
@@ -50,7 +50,8 @@
#include "Poco/Format.h"
#include "Poco/Exception.h"
#include <sstream>
#include <ctype.h>
#include <cctype>
#include <cstddef>
namespace Poco {
@@ -111,7 +112,8 @@ namespace
{
case 'l':
case 'h':
case 'L': mod = *itFmt++; break;
case 'L':
case '*': mod = *itFmt++; break;
}
}
return mod;
@@ -132,6 +134,33 @@ namespace
case 'f': str << std::fixed; break;
}
}
void writeAnyInt(std::ostream& str, const Any& any)
{
if (any.type() == typeid(char))
str << static_cast<int>(AnyCast<char>(any));
else if (any.type() == typeid(signed char))
str << static_cast<int>(AnyCast<signed char>(any));
else if (any.type() == typeid(unsigned char))
str << static_cast<unsigned>(AnyCast<unsigned char>(any));
else if (any.type() == typeid(short))
str << AnyCast<short>(any);
else if (any.type() == typeid(unsigned short))
str << AnyCast<unsigned short>(any);
else if (any.type() == typeid(int))
str << AnyCast<int>(any);
else if (any.type() == typeid(unsigned int))
str << AnyCast<unsigned int>(any);
else if (any.type() == typeid(long))
str << AnyCast<long>(any);
else if (any.type() == typeid(unsigned long))
str << AnyCast<unsigned long>(any);
else if (any.type() == typeid(Int64))
str << AnyCast<Int64>(any);
else if (any.type() == typeid(UInt64))
str << AnyCast<UInt64>(any);
}
void formatOne(std::string& result, std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt, std::vector<Any>::const_iterator& itVal)
@@ -157,6 +186,7 @@ namespace
case 'l': str << AnyCast<long>(*itVal++); break;
case 'L': str << AnyCast<Int64>(*itVal++); break;
case 'h': str << AnyCast<short>(*itVal++); break;
case '*': writeAnyInt(str, *itVal++); break;
default: str << AnyCast<int>(*itVal++); break;
}
break;
@@ -169,6 +199,7 @@ namespace
case 'l': str << AnyCast<unsigned long>(*itVal++); break;
case 'L': str << AnyCast<UInt64>(*itVal++); break;
case 'h': str << AnyCast<unsigned short>(*itVal++); break;
case '*': writeAnyInt(str, *itVal++); break;
default: str << AnyCast<unsigned>(*itVal++); break;
}
break;
@@ -186,6 +217,11 @@ namespace
case 's':
str << RefAnyCast<std::string>(*itVal++);
break;
case 'z':
str << AnyCast<std::size_t>(*itVal++);
break;
case 'I':
case 'D':
default:
str << type;
}

4
Foundation/src/PurgeStrategy.cpp
View File

@@ -1,7 +1,7 @@
//
// PurgeStrategy.cpp
//
// $Id: //poco/1.3/Foundation/src/PurgeStrategy.cpp#1 $
// $Id: //poco/1.3/Foundation/src/PurgeStrategy.cpp#2 $
//
// Library: Foundation
// Package: Logging
@@ -66,7 +66,7 @@ void PurgeStrategy::list(const std::string& path, std::vector<File>& files)
std::string baseName = p.getFileName();
baseName.append(".");
DirectoryIterator it(Path::current());
DirectoryIterator it(parent);
DirectoryIterator end;
while (it != end)
{