head	1.2;
access;
symbols
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.11.13.19.19.08;	author markd;	state dead;
branches;
next	1.1;
commitid	BLxxtdelNTXOF3Yx;

1.1
date	2013.06.13.14.29.37;	author joerg;	state Exp;
branches;
next	;
commitid	lTNZbsbjefQOIsTw;


desc
@@


1.2
log
@Update to KDE SC 4.14.3
@
text
@$NetBSD: patch-kleopatra_utils_classify.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $

--- kleopatra/utils/classify.cpp.orig	2013-06-12 20:27:57.000000000 +0000
+++ kleopatra/utils/classify.cpp
@@@@ -43,10 +43,6 @@@@
 
 #include <boost/range.hpp>
 
-#ifdef __GNUC__
-# include <ext/algorithm>
-#endif
-
 #include <functional>
 
 using namespace boost;
@@@@ -149,10 +145,6 @@@@ unsigned int Kleo::classify( const QStri
 }
 
 unsigned int Kleo::classify( const QString & filename ) {
-#ifdef __GNUC__
-    assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
-#endif
-
     const QFileInfo fi( filename );
 
     const _classification * const it = qBinaryFind( begin( classifications ), end( classifications ),
@@@@ -175,10 +167,6 @@@@ unsigned int Kleo::classify( const QStri
 }
 
 unsigned int Kleo::classifyContent( const QByteArray & data ) {
-#ifdef __GNUC__
-    assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
-#endif
-
     static const char beginString[] = "-----BEGIN ";
     static const QByteArrayMatcher beginMatcher( beginString );
     int pos = beginMatcher.indexIn( data );
@


1.1
log
@Drop a bunch of ext/algorithm uses for asserts. Add explicit namespace
references to resolve ambiguity with a C++11 STL implementation.
@
text
@d1 1
a1 1
$NetBSD$
@