From owner-svn-ports-head@FreeBSD.ORG Fri May 16 07:58:05 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0990A7A1; Fri, 16 May 2014 07:58:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0C962424; Fri, 16 May 2014 07:58:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4G7w4i1094468; Fri, 16 May 2014 07:58:04 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4G7w4aT094466; Fri, 16 May 2014 07:58:04 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201405160758.s4G7w4aT094466@svn.freebsd.org> From: Alex Dupre Date: Fri, 16 May 2014 07:58:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354198 - head/databases/mongodb/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 07:58:05 -0000 Author: ale Date: Fri May 16 07:58:04 2014 New Revision: 354198 URL: http://svnweb.freebsd.org/changeset/ports/354198 QAT: https://qat.redports.org/buildarchive/r354198/ Log: Fix build on 32-bit archs. Added: head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp (contents, props changed) head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp (contents, props changed) Added: head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp Fri May 16 07:58:04 2014 (r354198) @@ -0,0 +1,11 @@ +--- src/mongo/db/kill_current_op.cpp.orig 2014-05-15 15:30:33.100157820 +0000 ++++ src/mongo/db/kill_current_op.cpp 2014-05-15 15:35:12.714138934 +0000 +@@ -152,7 +152,7 @@ + } + + // Return true with (approx) probability p = "chance". Recall: 0 <= chance <= 1. +- double next = static_cast(std::abs(checkForInterruptPRNG.nextInt64())); ++ double next = std::abs(static_cast(checkForInterruptPRNG.nextInt64())); + double upperBound = + std::numeric_limits::max() * failPointInfo["chance"].numberDouble(); + if (next > upperBound) { Added: head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp Fri May 16 07:58:04 2014 (r354198) @@ -0,0 +1,11 @@ +--- src/mongo/db/ops/modifier_push.cpp.orig 2014-05-15 15:24:21.650184430 +0000 ++++ src/mongo/db/ops/modifier_push.cpp 2014-05-15 15:25:51.014179801 +0000 +@@ -646,7 +646,7 @@ + } + + const int64_t numChildren = mutablebson::countChildren(_preparedState->elemFound); +- int64_t countRemoved = std::max(static_cast(0), numChildren - abs(_slice)); ++ int64_t countRemoved = std::max(static_cast(0), numChildren - (_slice >= 0 ? _slice : -_slice)); + + // If _slice is negative, remove from the bottom, otherwise from the top + const bool removeFromEnd = (_slice > 0);