Make lists classes again.

This commit is contained in:
Egor Pugin 2024-11-22 21:52:51 +03:00
parent 1355287df1
commit 1526cf16fb
2 changed files with 18 additions and 14 deletions

View File

@ -1110,13 +1110,15 @@ public:
// add TESS_API? // add TESS_API?
// move templated lists to public include dirs? // move templated lists to public include dirs?
#define ELISTIZEH(CLASSNAME) \ #define ELISTIZEH(CLASSNAME) \
struct CLASSNAME##_LIST : ELIST<CLASSNAME> { \ class CLASSNAME##_LIST : public ELIST<CLASSNAME> { \
using ELIST<CLASSNAME>::ELIST; \ public: \
}; \ using ELIST<CLASSNAME>::ELIST; \
struct CLASSNAME##_IT : ELIST<CLASSNAME>::ITERATOR { \ }; \
using base = ELIST<CLASSNAME>::ITERATOR; \ class CLASSNAME##_IT : public ELIST<CLASSNAME>::ITERATOR { \
using base::base; \ public: \
using base = ELIST<CLASSNAME>::ITERATOR; \
using base::base; \
}; };
} // namespace tesseract } // namespace tesseract

View File

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