From owner-svn-ports-all@freebsd.org Thu Feb 15 12:48:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6BE2F1B86D; Thu, 15 Feb 2018 12:48:06 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3020776EAF; Thu, 15 Feb 2018 12:48:04 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 941E01EEB3; Thu, 15 Feb 2018 12:48:04 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1FCm4bv004092; Thu, 15 Feb 2018 12:48:04 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1FCm4k4004087; Thu, 15 Feb 2018 12:48:04 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802151248.w1FCm4k4004087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 15 Feb 2018 12:48:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461916 - head/databases/rocksdb/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/databases/rocksdb/files X-SVN-Commit-Revision: 461916 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 12:48:07 -0000 Author: sunpoet Date: Thu Feb 15 12:48:04 2018 New Revision: 461916 URL: https://svnweb.freebsd.org/changeset/ports/461916 Log: Fix build on FreeBSD 10 PR: 225785 Submitted by: lbartoletti MFH: 2018Q1 Added: head/databases/rocksdb/files/patch-util-arena.cc (contents, props changed) head/databases/rocksdb/files/patch-util-arena.h (contents, props changed) head/databases/rocksdb/files/patch-util-arena_test.cc (contents, props changed) Added: head/databases/rocksdb/files/patch-util-arena.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util-arena.cc Thu Feb 15 12:48:04 2018 (r461916) @@ -0,0 +1,11 @@ +--- util/arena.cc.orig 2018-01-31 01:15:39 UTC ++++ util/arena.cc +@@ -33,7 +33,7 @@ const size_t Arena::kInlineSize; + + const size_t Arena::kMinBlockSize = 4096; + const size_t Arena::kMaxBlockSize = 2u << 30; +-static const int kAlignUnit = alignof(max_align_t); ++static const int kAlignUnit = alignof(std::max_align_t); + + size_t OptimizeBlockSize(size_t block_size) { + // Make sure block_size is in optimal range Added: head/databases/rocksdb/files/patch-util-arena.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util-arena.h Thu Feb 15 12:48:04 2018 (r461916) @@ -0,0 +1,11 @@ +--- util/arena.h.orig 2018-01-31 01:15:39 UTC ++++ util/arena.h +@@ -82,7 +82,7 @@ class Arena : public Allocator { + } + + private: +- char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(max_align_t)))); ++ char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(std::max_align_t)))); + // Number of bytes allocated in one block + const size_t kBlockSize; + // Array of new[] allocated memory blocks Added: head/databases/rocksdb/files/patch-util-arena_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util-arena_test.cc Thu Feb 15 12:48:04 2018 (r461916) @@ -0,0 +1,11 @@ +--- util/arena_test.cc.orig 2018-01-31 01:15:39 UTC ++++ util/arena_test.cc +@@ -91,7 +91,7 @@ static void ApproximateMemoryUsageTest(s + ASSERT_EQ(kZero, arena.ApproximateMemoryUsage()); + + // allocate inline bytes +- const size_t kAlignUnit = alignof(max_align_t); ++ const size_t kAlignUnit = alignof(std::max_align_t); + EXPECT_TRUE(arena.IsInInlineBlock()); + arena.AllocateAligned(kAlignUnit); + EXPECT_TRUE(arena.IsInInlineBlock());