Merge changes I43d9d477,I8d4661ec

* changes:
  vp9_end_to_end_test: fix compile with gcc 4.8.5
  sad_test: fix compilation w/gcc 4.8.5

2 files changed, 5 insertions, 4 deletions

diff --git a/test/sad_test.cc b/test/sad_test.cc
index 34cb26ed1..ee10a4638 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -26,6 +26,10 @@
 #include "vpx_ports/msvc.h"
 #include "vpx_ports/vpx_timer.h"
 
+// const[expr] should be sufficient for DECLARE_ALIGNED but early
+// implementations of c++11 appear to have some issues with it.
+#define kDataAlignment 32
+
 template <typename Function>
 struct TestParams {
   TestParams(int w, int h, Function f, int bd = -1)
@@ -117,9 +121,6 @@ class SADTestBase : public ::testing::TestWithParam<ParamType> {
  protected:
   // Handle blocks up to 4 blocks 64x64 with stride up to 128
   // crbug.com/webm/1660
-  // const[expr] should be sufficient for DECLARE_ALIGNED but early
-  // implementations of c++11 appear to have some issues with it.
-  enum { kDataAlignment = 32 };
   static const int kDataBlockSize = 64 * 128;
   static const int kDataBufferSize = 4 * kDataBlockSize;
 
diff --git a/test/vp9_end_to_end_test.cc b/test/vp9_end_to_end_test.cc
index 4e3a78fac..7cc126ea5 100644
--- a/test/vp9_end_to_end_test.cc
+++ b/test/vp9_end_to_end_test.cc
@@ -342,7 +342,7 @@ VP9_INSTANTIATE_TEST_SUITE(EndToEndTestLarge,
 VP9_INSTANTIATE_TEST_SUITE(EndToEndNV12,
                            ::testing::Values(::libvpx_test::kRealTime),
                            ::testing::ValuesIn(kTestVectorsNv12),
-                           ::testing::ValuesIn({ 6, 7, 8 }));
+                           ::testing::Values(6, 7, 8));
 
 VP9_INSTANTIATE_TEST_SUITE(EndToEndTestAdaptiveRDThresh,
                            ::testing::Values(5, 6, 7), ::testing::Values(8, 9));