Merge branch 'poco-1.10.1' into devel

This commit is contained in:
Günter Obiltschnig
2020-02-07 18:14:46 +01:00
6 changed files with 59 additions and 28 deletions

View File

@@ -21,6 +21,7 @@
#include "Poco/Foundation.h"
#include "Poco/Exception.h"
#include <algorithm>
#include <cstddef>
namespace Poco {
@@ -306,6 +307,11 @@ public:
return _ptr == ptr;
}
bool operator == (std::nullptr_t ptr) const
{
return _ptr == ptr;
}
bool operator != (const AutoPtr& ptr) const
{
return _ptr != ptr._ptr;
@@ -321,6 +327,11 @@ public:
return _ptr != ptr;
}
bool operator != (std::nullptr_t ptr) const
{
return _ptr != ptr;
}
bool operator < (const AutoPtr& ptr) const
{
return _ptr < ptr._ptr;

View File

@@ -22,6 +22,7 @@
#include "Poco/Exception.h"
#include "Poco/AtomicCounter.h"
#include <algorithm>
#include <cstddef>
namespace Poco {
@@ -336,6 +337,11 @@ public:
return get() == ptr;
}
bool operator == (std::nullptr_t ptr) const
{
return get() == ptr;
}
bool operator != (const SharedPtr& ptr) const
{
return get() != ptr.get();
@@ -351,6 +357,11 @@ public:
return get() != ptr;
}
bool operator != (std::nullptr_t ptr) const
{
return get() != ptr;
}
bool operator < (const SharedPtr& ptr) const
{
return get() < ptr.get();