Use C++11 alignment primitives

cc/paint/paint_op_buffer.cc

Index: cc/paint/paint_op_buffer.cc
diff --git a/cc/paint/paint_op_buffer.cc b/cc/paint/paint_op_buffer.cc
index b52b55553bf29682c57af38e4a6d7cb4e6470dac..2c6a7a7e2ce8acda84f0118b2f69f9a73fd6a5a8 100644
--- a/cc/paint/paint_op_buffer.cc
+++ b/cc/paint/paint_op_buffer.cc
@@ -194,7 +194,7 @@ TYPES(M);
 #undef M
 
 #define M(T)                                               \
-  static_assert(ALIGNOF(T) <= PaintOpBuffer::PaintOpAlign, \
+  static_assert(alignof(T) <= PaintOpBuffer::PaintOpAlign, \
                 #T " must have alignment no bigger than PaintOpAlign");
 TYPES(M);
 #undef M
@@ -780,7 +780,7 @@ std::pair<void*, size_t> PaintOpBuffer::AllocatePaintOp(size_t sizeof_op,
       push<NoopOp>();
     } else {
       op_count_++;
-      return std::make_pair(first_op_.void_data(), 0);
+      return std::pair<void*, size_t>(&first_op_, 0);
     }
   }