Index: head/databases/rocksdb/files/patch-util-arena.cc
===================================================================
--- head/databases/rocksdb/files/patch-util-arena.cc	(nonexistent)
+++ head/databases/rocksdb/files/patch-util-arena.cc	(revision 461916)
@@ -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

Property changes on: head/databases/rocksdb/files/patch-util-arena.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/databases/rocksdb/files/patch-util-arena.h
===================================================================
--- head/databases/rocksdb/files/patch-util-arena.h	(nonexistent)
+++ head/databases/rocksdb/files/patch-util-arena.h	(revision 461916)
@@ -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

Property changes on: head/databases/rocksdb/files/patch-util-arena.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/databases/rocksdb/files/patch-util-arena_test.cc
===================================================================
--- head/databases/rocksdb/files/patch-util-arena_test.cc	(nonexistent)
+++ head/databases/rocksdb/files/patch-util-arena_test.cc	(revision 461916)
@@ -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());

Property changes on: head/databases/rocksdb/files/patch-util-arena_test.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property