Commit d3bccacd authored by Davis King's avatar Davis King

Removed the old is_same_object function from set_utils

since it conflicts with the new one in some cases.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403892
parent 577ef82d
......@@ -11,23 +11,6 @@ namespace dlib
// ----------------------------------------------------------------------------------------
namespace set_utils_helpers
{
template <typename T, typename U>
inline bool is_same_object (
const T& a,
const U& b
)
{
if (is_same_type<const T,const U>::value == false)
return false;
if ((void*)&a == (void*)&b)
return true;
else
return false;
}
}
template <
typename T,
typename U
......@@ -37,7 +20,6 @@ namespace dlib
const U& b
)
{
using namespace set_utils_helpers;
if (is_same_object(a,b))
return a.size();
......@@ -79,7 +61,6 @@ namespace dlib
)
{
typedef typename T::type type;
using namespace set_utils_helpers;
if (is_same_object(a,u) || is_same_object(b,u))
{
V local_u;
......@@ -141,7 +122,6 @@ namespace dlib
)
{
typedef typename T::type type;
using namespace set_utils_helpers;
if (is_same_object(a,i) || is_same_object(b,i))
{
V local_i;
......@@ -221,7 +201,6 @@ namespace dlib
)
{
typedef typename T::type type;
using namespace set_utils_helpers;
if (is_same_object(a,d) || is_same_object(b,d))
{
V local_d;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment