unittest: Replace ABSL_ARRAYSIZE by ARRAYSIZE

Remove the local definition of ABSL_ARRAYSIZE to avoid a conflict with Abseil. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · Jan 23, 2019 · a702f2d · a702f2d
1 parent 77d0b6c
commit a702f2d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/unittest/include_gunit.h b/unittest/include_gunit.h
@@ -50,9 +50,6 @@ class file : public tesseract::File {
   }
 };
 
-#if !defined(ABSL_ARRAYSIZE)
-#define ABSL_ARRAYSIZE(arr) (sizeof(arr) / sizeof(arr[0]))
-#endif
 #define ARRAYSIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 #define CHECK(test) ASSERT_HOST(test)
 #define CHECK_GT(test, value) ASSERT_HOST((test) > (value))

diff --git a/unittest/stats_test.cc b/unittest/stats_test.cc
@@ -23,7 +23,7 @@ class STATSTest : public testing::Test {
  public:
   void SetUp() {
     stats_.set_range(0, 16);
-    for (int i = 0; i < ABSL_ARRAYSIZE(kTestData); ++i)
+    for (int i = 0; i < ARRAYSIZE(kTestData); ++i)
       stats_.add(i, kTestData[i]);
   }