head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.02.02.07.43.40;	author ryoon;	state dead;
branches;
next	1.1;
commitid	SCRPn9tBPxRmXunx;

1.1
date	2014.01.20.19.27.51;	author joerg;	state Exp;
branches;
next	;
commitid	mZR31TNIY8KOgTlx;


desc
@@


1.2
log
@Update to 4.2.0.4

Changelog:
* Many bugfixes
* Many new features
See https://wiki.documentfoundation.org/ReleaseNotes/4.2
and https://www.libreoffice.org/download/4-2-new-features-and-fixes/
@
text
@$NetBSD: patch-binaryurp_source_lessoperators.cxx,v 1.1 2014/01/20 19:27:51 joerg Exp $

--- binaryurp/source/lessoperators.cxx.orig	2013-10-22 17:49:23.000000000 +0000
+++ binaryurp/source/lessoperators.cxx
@@@@ -38,8 +38,30 @@@@ bool operator <(TypeDescription const & 
     typelib_TypeClass tc2 = right.get()->eTypeClass;
     return tc1 < tc2 ||
         (tc1 == tc2 &&
-         (OUString(left.get()->pTypeName) <
-          OUString(right.get()->pTypeName)));
+         (OUString::unacquired(&left.get()->pTypeName) <
+          OUString::unacquired(&right.get()->pTypeName)));
+}
+
+bool TypeDescEqual::operator()( const TypeDescription& rLeft, const TypeDescription& rRight) const
+{
+	assert( rLeft.is() && rRight.is());
+	const typelib_TypeDescription& rA = *rLeft.get();
+	const typelib_TypeDescription& rB = *rRight.get();
+	if( rA.eTypeClass != rB.eTypeClass)
+		return false;
+	const sal_Int32 nCmp = rtl_ustr_compare_WithLength(
+			rA.pTypeName->buffer, rA.pTypeName->length,
+			rB.pTypeName->buffer, rB.pTypeName->length);
+	return (nCmp == 0);
+}
+
+sal_Int32 TypeDescHash::operator()( const TypeDescription& rTD) const
+{
+	assert( rTD.is());
+	const typelib_TypeDescription& rA = *rTD.get();
+	sal_Int32 h = rtl_ustr_hashCode_WithLength( rA.pTypeName->buffer, rA.pTypeName->length);
+	h ^= static_cast<sal_Int32>(rA.eTypeClass);
+	return h;
 }
 
 } } } }
@@@@ -47,8 +69,8 @@@@ bool operator <(TypeDescription const & 
 namespace rtl {
 
 bool operator <(ByteSequence const & left, ByteSequence const & right) {
-    for (sal_Int32 i = 0; i != std::min(left.getLength(), right.getLength());
-         ++i)
+    const sal_Int32 nLen = std::min( left.getLength(), right.getLength());
+    for( sal_Int32 i = 0; i < nLen; ++i )
     {
         if (left[i] < right[i]) {
             return true;
@


1.1
log
@Fix build with Clang. Patches mostly from FreeBSD.
@
text
@d1 1
a1 1
$NetBSD$
@