From: angiebird <angiebird@google.com>
Date: Thu, 6 Feb 2020 22:53:21 +0000 (-0800)
Subject: Sync simple_encode.h
X-Git-Tag: v1.9.0-rc1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3171b107ae4caa4ad0aa8df6213d9d0144328ca;p=libvpx

Sync simple_encode.h

Change-Id: I046b8c65c96e1864813f9a82649dd6b41ba0aa1f
---

diff --git a/vp9/simple_encode.h b/vp9/simple_encode.h
index 03c361deb..a47290bbe 100644
--- a/vp9/simple_encode.h
+++ b/vp9/simple_encode.h
@@ -87,13 +87,12 @@ struct NewMotionVectorContextCounts {
   std::vector<NewMotionvectorComponentCounts> comps;
 };
 
-#define UintArray2D std::vector<std::vector<unsigned int>>
-#define UintArray3D std::vector<std::vector<std::vector<unsigned int>>>
-#define UintArray5D \
-  std::vector<std::vector<std::vector<std::vector<std::vector<unsigned int>>>>>
-#define UintArray6D        \
-  std::vector<std::vector< \
-      std::vector<std::vector<std::vector<std::vector<unsigned int>>>>>>
+using UintArray2D = std::vector<std::vector<unsigned int>>;
+using UintArray3D = std::vector<std::vector<std::vector<unsigned int>>>;
+using UintArray5D = std::vector<
+    std::vector<std::vector<std::vector<std::vector<unsigned int>>>>>;
+using UintArray6D = std::vector<std::vector<
+    std::vector<std::vector<std::vector<std::vector<unsigned int>>>>>>;
 
 // This structure is a copy of vp9 |tx_counts|.
 struct TransformSizeCounts {