From: dirk Date: Sat, 26 Dec 2015 14:30:42 +0000 (+0100) Subject: Removed compare methods. X-Git-Tag: 7.0.1-0~405 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d31cea86a1f0746a4ae16c1e13aa8135ff577692;p=imagemagick Removed compare methods. --- diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp index 7d089fab7..2bfa3a791 100644 --- a/Magick++/lib/Drawable.cpp +++ b/Magick++/lib/Drawable.cpp @@ -120,37 +120,6 @@ void Magick::Drawable::operator()(MagickCore::DrawingWand * context_) const dp->operator()(context_); } -MagickPPExport int Magick::operator == ( const Magick::Drawable& /*left_*/, - const Magick::Drawable& /*right_*/ ) -{ - return ( 1 ); -} -MagickPPExport int Magick::operator != ( const Magick::Drawable& /*left_*/, - const Magick::Drawable& /*right_*/ ) -{ - return ( 0 ); -} -MagickPPExport int Magick::operator > ( const Magick::Drawable& /*left_*/, - const Magick::Drawable& /*right_*/ ) -{ - return ( 0 ); -} -MagickPPExport int Magick::operator < ( const Magick::Drawable& /*left_*/, - const Magick::Drawable& /*right_*/ ) -{ - return ( 0 ); -} -MagickPPExport int Magick::operator >= ( const Magick::Drawable& left_, - const Magick::Drawable& right_ ) -{ - return ( ( left_ > right_ ) || ( left_ == right_ ) ); -} -MagickPPExport int Magick::operator <= ( const Magick::Drawable& left_, - const Magick::Drawable& right_ ) -{ - return ( ( left_ < right_ ) || ( left_ == right_ ) ); -} - /*virtual*/ Magick::VPathBase::~VPathBase ( void ) { diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h index 71e78c1ba..d796e3c3c 100644 --- a/Magick++/lib/Magick++/Drawable.h +++ b/Magick++/lib/Magick++/Drawable.h @@ -142,20 +142,6 @@ namespace Magick DrawableBase* dp; }; - // Compare two Drawable objects regardless of LHS/RHS - extern MagickPPExport int operator == ( const Drawable& left_, - const Drawable& right_ ); - extern MagickPPExport int operator != ( const Drawable& left_, - const Drawable& right_ ); - extern MagickPPExport int operator > ( const Drawable& left_, - const Drawable& right_ ); - extern MagickPPExport int operator < ( const Drawable& left_, - const Drawable& right_ ); - extern MagickPPExport int operator >= ( const Drawable& left_, - const Drawable& right_ ); - extern MagickPPExport int operator <= ( const Drawable& left_, - const Drawable& right_ ); - typedef std::vector DrawableList; #if defined(MagickDLLExplicitTemplate) @@ -163,9 +149,6 @@ namespace Magick MagickDrawableExtern template class MagickPPExport std::allocator; -// MagickDrawableExtern template class MagickPPExport -// std::vector >; - #endif // MagickDLLExplicitTemplate //