Skip to content

Commit ba1384e

Browse files
obiltschnigobiltschnig
committed
latest changes from main repository
1 parent 3e46ab3 commit ba1384e

23 files changed

Lines changed: 344 additions & 134 deletions

‎Foundation/include/Poco/AbstractCache.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// AbstractCache.h
33
//
4-
// $Id: //poco/Main/Foundation/include/Poco/AbstractCache.h#13 $
4+
// $Id: //poco/Main/Foundation/include/Poco/AbstractCache.h#14 $
55
//
66
// Library: Foundation
77
// Package: Cache
@@ -50,6 +50,7 @@
5050
#include "Poco/SharedPtr.h"
5151
#include <map>
5252
#include <set>
53+
#include <cstddef>
5354

5455

5556
namespace Poco {

‎Foundation/include/Poco/DynamicAnyHolder.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DynamicAnyHolder.h
33
//
4-
// $Id: //poco/Main/Foundation/include/Poco/DynamicAnyHolder.h#3 $
4+
// $Id: //poco/Main/Foundation/include/Poco/DynamicAnyHolder.h#4 $
55
//
66
// Library: Poco
77
// Package: Core
@@ -211,6 +211,7 @@ class DynamicAnyHolderImpl: public DynamicAnyHolder
211211
/// RangeException (if an attempt is made to assign a numeric value outside of the target min/max limits
212212
/// SyntaxException (if an attempt is made to convert a string containing non-numeric characters to number)
213213
{
214+
public:
214215
DynamicAnyHolderImpl()
215216
{
216217
}

‎Foundation/include/Poco/HashTable.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HashTable.h
33
//
4-
// $Id: //poco/Main/Foundation/include/Poco/HashTable.h#8 $
4+
// $Id: //poco/Main/Foundation/include/Poco/HashTable.h#9 $
55
//
66
// Library: Foundation
77
// Package: Hashing
@@ -46,7 +46,7 @@
4646
#include "Poco/HashStatistic.h"
4747
#include <vector>
4848
#include <map>
49-
#include <stddef.h>
49+
#include <cstddef>
5050

5151

5252
namespace Poco {
@@ -293,7 +293,7 @@ class HashTable
293293
return _entries[hsh] && (_entries[hsh]->end() != _entries[hsh]->find(key));
294294
}
295295

296-
size_t size() const
296+
std::size_t size() const
297297
/// Returns the number of elements already inserted into the HashTable
298298
{
299299
return _size;
@@ -379,8 +379,8 @@ class HashTable
379379

380380
private:
381381
HashTableVector _entries;
382-
size_t _size;
383-
UInt32 _maxCapacity;
382+
std::size_t _size;
383+
UInt32 _maxCapacity;
384384
KeyHashFunction _hash;
385385
};
386386

‎Foundation/include/Poco/LRUStrategy.h‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// LRUStrategy.h
33
//
4-
// $Id: //poco/Main/Foundation/include/Poco/LRUStrategy.h#4 $
4+
// $Id: //poco/Main/Foundation/include/Poco/LRUStrategy.h#5 $
55
//
66
// Library: Foundation
77
// Package: Cache
@@ -47,6 +47,7 @@
4747
#include "Poco/Exception.h"
4848
#include <list>
4949
#include <map>
50+
#include <cstddef>
5051

5152

5253
namespace Poco {
@@ -65,7 +66,7 @@ class LRUStrategy: public AbstractStrategy<TKey, TValue>
6566
typedef typename KeyIndex::const_iterator ConstIndexIterator;
6667

6768
public:
68-
LRUStrategy(size_t size):
69+
LRUStrategy(std::size_t size):
6970
_size(size)
7071
{
7172
if (_size < 1) throw InvalidArgumentException("size must be > 0");
@@ -127,16 +128,16 @@ class LRUStrategy: public AbstractStrategy<TKey, TValue>
127128
// Note: replace only informs the cache which elements
128129
// it would like to remove!
129130
// it does not remove them on its own!
130-
size_t curSize = _keyIndex.size();
131+
std::size_t curSize = _keyIndex.size();
131132

132133
if (curSize < _size)
133134
{
134135
return;
135136
}
136137

137-
size_t diff = curSize - _size;
138+
std::size_t diff = curSize - _size;
138139
Iterator it = --_keys.end(); //--keys can never be invoked on an empty list due to the minSize==1 requirement of LRU
139-
size_t i = 0;
140+
std::size_t i = 0;
140141

141142
while (i++ < diff)
142143
{
@@ -149,9 +150,9 @@ class LRUStrategy: public AbstractStrategy<TKey, TValue>
149150
}
150151

151152
protected:
152-
size_t _size; /// Number of keys the cache can store.
153-
Keys _keys;
154-
KeyIndex _keyIndex; /// For faster access to _keys
153+
std::size_t _size; /// Number of keys the cache can store.
154+
Keys _keys;
155+
KeyIndex _keyIndex; /// For faster access to _keys
155156
};
156157

157158

‎Foundation/include/Poco/SharedMemory.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// SharedMemory.h
33
//
4-
// $Id: //poco/Main/Foundation/include/Poco/SharedMemory.h#3 $
4+
// $Id: //poco/Main/Foundation/include/Poco/SharedMemory.h#4 $
55
//
66
// Library: Poco
77
// Package: Processes
@@ -42,6 +42,7 @@
4242

4343
#include "Poco/Poco.h"
4444
#include <algorithm>
45+
#include <cstddef>
4546

4647

4748
namespace Poco {

‎Foundation/src/SharedMemory_POSIX.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// SharedMemoryImpl.cpp
33
//
4-
// $Id: //poco/Main/Foundation/src/SharedMemory_POSIX.cpp#7 $
4+
// $Id: //poco/Main/Foundation/src/SharedMemory_POSIX.cpp#8 $
55
//
66
// Library: Poco
77
// Package: Processes
@@ -55,6 +55,10 @@ SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, Sh
5555
_name("/"),
5656
_fileMapped(false)
5757
{
58+
#if POCO_OS == POCO_OS_HPUX
59+
_name.append("tmp/");
60+
#endif
61+
5862
_name.append(name);
5963

6064
int flags = O_CREAT;

‎Net/include/Poco/Net/HTTPChunkedStream.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPChunkedStream.h
33
//
4-
// $Id: //poco/Main/Net/include/Poco/Net/HTTPChunkedStream.h#3 $
4+
// $Id: //poco/Main/Net/include/Poco/Net/HTTPChunkedStream.h#4 $
55
//
66
// Library: Net
77
// Package: HTTP
@@ -43,6 +43,7 @@
4343
#include "Poco/Net/Net.h"
4444
#include "Poco/Net/HTTPBasicStreamBuf.h"
4545
#include "Poco/MemoryPool.h"
46+
#include <cstddef>
4647
#include <istream>
4748
#include <ostream>
4849

@@ -97,7 +98,7 @@ class Net_API HTTPChunkedInputStream: public HTTPChunkedIOS, public std::istream
9798
HTTPChunkedInputStream(HTTPSession& session);
9899
~HTTPChunkedInputStream();
99100

100-
void* operator new(size_t size);
101+
void* operator new(std::size_t size);
101102
void operator delete(void* ptr);
102103

103104
private:
@@ -112,7 +113,7 @@ class Net_API HTTPChunkedOutputStream: public HTTPChunkedIOS, public std::ostrea
112113
HTTPChunkedOutputStream(HTTPSession& session);
113114
~HTTPChunkedOutputStream();
114115

115-
void* operator new(size_t size);
116+
void* operator new(std::size_t size);
116117
void operator delete(void* ptr);
117118

118119
private:

‎Net/include/Poco/Net/HTTPFixedLengthStream.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPFixedLengthStream.h
33
//
4-
// $Id: //poco/Main/Net/include/Poco/Net/HTTPFixedLengthStream.h#2 $
4+
// $Id: //poco/Main/Net/include/Poco/Net/HTTPFixedLengthStream.h#3 $
55
//
66
// Library: Net
77
// Package: HTTP
@@ -42,6 +42,7 @@
4242

4343
#include "Poco/Net/Net.h"
4444
#include "Poco/Net/HTTPBasicStreamBuf.h"
45+
#include <cstddef>
4546
#include <istream>
4647
#include <ostream>
4748

@@ -96,7 +97,7 @@ class Net_API HTTPFixedLengthInputStream: public HTTPFixedLengthIOS, public std:
9697
HTTPFixedLengthInputStream(HTTPSession& session, std::streamsize length);
9798
~HTTPFixedLengthInputStream();
9899

99-
void* operator new(size_t size);
100+
void* operator new(std::size_t size);
100101
void operator delete(void* ptr);
101102

102103
private:
@@ -111,7 +112,7 @@ class Net_API HTTPFixedLengthOutputStream: public HTTPFixedLengthIOS, public std
111112
HTTPFixedLengthOutputStream(HTTPSession& session, std::streamsize length);
112113
~HTTPFixedLengthOutputStream();
113114

114-
void* operator new(size_t size);
115+
void* operator new(std::size_t size);
115116
void operator delete(void* ptr);
116117

117118
private:

‎Net/include/Poco/Net/HTTPHeaderStream.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPHeaderStream.h
33
//
4-
// $Id: //poco/Main/Net/include/Poco/Net/HTTPHeaderStream.h#2 $
4+
// $Id: //poco/Main/Net/include/Poco/Net/HTTPHeaderStream.h#3 $
55
//
66
// Library: Net
77
// Package: HTTP
@@ -43,6 +43,7 @@
4343
#include "Poco/Net/Net.h"
4444
#include "Poco/Net/HTTPBasicStreamBuf.h"
4545
#include "Poco/MemoryPool.h"
46+
#include <cstddef>
4647
#include <istream>
4748
#include <ostream>
4849

@@ -94,7 +95,7 @@ class Net_API HTTPHeaderInputStream: public HTTPHeaderIOS, public std::istream
9495
HTTPHeaderInputStream(HTTPSession& session);
9596
~HTTPHeaderInputStream();
9697

97-
void* operator new(size_t size);
98+
void* operator new(std::size_t size);
9899
void operator delete(void* ptr);
99100

100101
private:
@@ -109,7 +110,7 @@ class Net_API HTTPHeaderOutputStream: public HTTPHeaderIOS, public std::ostream
109110
HTTPHeaderOutputStream(HTTPSession& session);
110111
~HTTPHeaderOutputStream();
111112

112-
void* operator new(size_t size);
113+
void* operator new(std::size_t size);
113114
void operator delete(void* ptr);
114115

115116
private:

‎Net/include/Poco/Net/HTTPServerResponse.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPServerResponse.h
33
//
4-
// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerResponse.h#5 $
4+
// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerResponse.h#6 $
55
//
66
// Library: Net
77
// Package: HTTPServer
@@ -42,6 +42,7 @@
4242

4343
#include "Poco/Net/Net.h"
4444
#include "Poco/Net/HTTPResponse.h"
45+
#include <cstddef>
4546
#include <ostream>
4647

4748

0 commit comments

Comments
 (0)