Make lists classes again.

tesseract-ocr · Nov 22, 2024 · 1526cf1 · 1526cf1
1 parent 1355287
commit 1526cf1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/ccutil/elst.h b/src/ccutil/elst.h
@@ -1110,13 +1110,15 @@ class ELIST {
 
 // add TESS_API?
 // move templated lists to public include dirs?
-#define ELISTIZEH(CLASSNAME)                                                  \
-  struct CLASSNAME##_LIST : ELIST<CLASSNAME> {                          \
-    using ELIST<CLASSNAME>::ELIST;                                            \
-  };                  \
-  struct CLASSNAME##_IT : ELIST<CLASSNAME>::ITERATOR {            \
-    using base = ELIST<CLASSNAME>::ITERATOR;          \
-    using base::base;                   \
+#define ELISTIZEH(CLASSNAME)                            \
+  class CLASSNAME##_LIST : public ELIST<CLASSNAME> {    \
+  public:                                               \
+    using ELIST<CLASSNAME>::ELIST;                      \
+  };                                                    \
+  class CLASSNAME##_IT : public ELIST<CLASSNAME>::ITERATOR { \
+  public:                                               \
+    using base = ELIST<CLASSNAME>::ITERATOR;            \
+    using base::base;                                   \
   };
 
 } // namespace tesseract

diff --git a/src/ccutil/elst2.h b/src/ccutil/elst2.h
@@ -1159,13 +1159,15 @@ class ELIST2 {
 
 // add TESS_API?
 // move templated lists to public include dirs?
-#define ELIST2IZEH(CLASSNAME)                                                  \
-  struct CLASSNAME##_LIST : ELIST2<CLASSNAME> {                          \
-    using ELIST2<CLASSNAME>::ELIST2;                                            \
-  };                  \
-  struct CLASSNAME##_IT : ELIST2<CLASSNAME>::ITERATOR {            \
-    using base = ELIST2<CLASSNAME>::ITERATOR;          \
-    using base::base;                   \
+#define ELIST2IZEH(CLASSNAME)                           \
+  class CLASSNAME##_LIST : public ELIST2<CLASSNAME> {   \
+  public:                                               \
+    using ELIST2<CLASSNAME>::ELIST2;                    \
+  };                                                    \
+  class CLASSNAME##_IT : public ELIST2<CLASSNAME>::ITERATOR { \
+  public:                                               \
+    using base = ELIST2<CLASSNAME>::ITERATOR;           \
+    using base::base;                                   \
   };
 
 } // namespace tesseract