svn commit: r461922 - branches/2018Q1/databases/rocksdb/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Feb 15 12:52:12 2018
New Revision: 461922
URL: https://svnweb.freebsd.org/changeset/ports/461922

Log:
  MFH: r461916
  
  Fix build on FreeBSD 10
  
  PR:		225785
  Submitted by:	lbartoletti <lbartoletti at tuxfamily.org>
  
  Approved by:	ports-secteam (blanket)

Added:
  branches/2018Q1/databases/rocksdb/files/patch-util-arena.cc
     - copied unchanged from r461916, head/databases/rocksdb/files/patch-util-arena.cc
  branches/2018Q1/databases/rocksdb/files/patch-util-arena.h
     - copied unchanged from r461916, head/databases/rocksdb/files/patch-util-arena.h
  branches/2018Q1/databases/rocksdb/files/patch-util-arena_test.cc
     - copied unchanged from r461916, head/databases/rocksdb/files/patch-util-arena_test.cc
Modified:
Directory Properties:
  branches/2018Q1/   (props changed)

Copied: branches/2018Q1/databases/rocksdb/files/patch-util-arena.cc (from r461916, head/databases/rocksdb/files/patch-util-arena.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/databases/rocksdb/files/patch-util-arena.cc	Thu Feb 15 12:52:12 2018	(r461922, copy of r461916, head/databases/rocksdb/files/patch-util-arena.cc)
@@ -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

Copied: branches/2018Q1/databases/rocksdb/files/patch-util-arena.h (from r461916, head/databases/rocksdb/files/patch-util-arena.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/databases/rocksdb/files/patch-util-arena.h	Thu Feb 15 12:52:12 2018	(r461922, copy of r461916, head/databases/rocksdb/files/patch-util-arena.h)
@@ -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

Copied: branches/2018Q1/databases/rocksdb/files/patch-util-arena_test.cc (from r461916, head/databases/rocksdb/files/patch-util-arena_test.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/databases/rocksdb/files/patch-util-arena_test.cc	Thu Feb 15 12:52:12 2018	(r461922, copy of r461916, head/databases/rocksdb/files/patch-util-arena_test.cc)
@@ -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());