change OOVPA_TABLE_COUNT to XBSDB_ARRAY_SIZE

Cxbx-Reloaded · Mar 21, 2019 · 76bd73a · 76bd73a
1 parent 680bb63
commit 76bd73a
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/OOVPA.h b/OOVPA.h
@@ -145,8 +145,8 @@ typedef struct _OOVPATable
 
 // http://en.cppreference.com/w/cpp/iterator/size
 //#include <iterator>
-//#define OOVPA_TABLE_COUNT(x) std::size(x)
-#define OOVPA_TABLE_COUNT(x) (sizeof(x)/sizeof(x[0]))
+//#define XBSDB_ARRAY_SIZE(x) std::size(x)
+#define XBSDB_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
 #define OOVPA_TABLE_ENTRY_FULL(Oovpa, DebugName, Version) \
     { & Oovpa ## _ ## Version.Header, DebugName, Version }

diff --git a/OOVPADatabase/D3D8LTCG_OOVPA.inl b/OOVPADatabase/D3D8LTCG_OOVPA.inl
@@ -486,6 +486,6 @@ OOVPATable D3D8LTCG_OOVPAV2[] = {
 // ******************************************************************
 // * D3D8LTCG_OOVPA_COUNT
 // ******************************************************************
-#define D3D8LTCG_OOVPA_COUNT OOVPA_TABLE_COUNT(D3D8LTCG_OOVPAV2)
+#define D3D8LTCG_OOVPA_COUNT XBSDB_ARRAY_SIZE(D3D8LTCG_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/D3D8_OOVPA.inl b/OOVPADatabase/D3D8_OOVPA.inl
@@ -427,6 +427,6 @@ OOVPATable D3D8_OOVPAV2[] = {
 // ******************************************************************
 // * D3D8_OOVPA_COUNT
 // ******************************************************************
-#define D3D8_OOVPA_COUNT OOVPA_TABLE_COUNT(D3D8_OOVPAV2)
+#define D3D8_OOVPA_COUNT XBSDB_ARRAY_SIZE(D3D8_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/DSound_OOVPA.inl b/OOVPADatabase/DSound_OOVPA.inl
@@ -513,6 +513,6 @@ OOVPATable DSound_OOVPAV2[] = {
 // ******************************************************************
 // * DSound_OOVPA_COUNT
 // ******************************************************************
-#define DSound_OOVPA_COUNT OOVPA_TABLE_COUNT(DSound_OOVPAV2)
+#define DSound_OOVPA_COUNT XBSDB_ARRAY_SIZE(DSound_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/XActEng_OOVPA.inl b/OOVPADatabase/XActEng_OOVPA.inl
@@ -98,6 +98,6 @@ OOVPATable XACTENG_OOVPAV2[] = {
 // ******************************************************************
 // * XACTENG_OOVPA_COUNT
 // ******************************************************************
-#define XACTENG_OOVPA_COUNT OOVPA_TABLE_COUNT(XACTENG_OOVPAV2)
+#define XACTENG_OOVPA_COUNT XBSDB_ARRAY_SIZE(XACTENG_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/XGraphic_OOVPA.inl b/OOVPADatabase/XGraphic_OOVPA.inl
@@ -93,6 +93,6 @@ OOVPATable XGRAPHC_OOVPAV2[] = {
 // ******************************************************************
 // * XGRAPHC_OOVPA_COUNT
 // ******************************************************************
-#define XGRAPHC_OOVPA_COUNT OOVPA_TABLE_COUNT(XGRAPHC_OOVPAV2)
+#define XGRAPHC_OOVPA_COUNT XBSDB_ARRAY_SIZE(XGRAPHC_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/XNet_OOVPA.inl b/OOVPADatabase/XNet_OOVPA.inl
@@ -72,6 +72,6 @@ OOVPATable XNET_OOVPAV2[] = {
 // ******************************************************************
 // * XNET_OOVPA_COUNT
 // ******************************************************************
-#define XNET_OOVPA_COUNT OOVPA_TABLE_COUNT(XNET_OOVPAV2)
+#define XNET_OOVPA_COUNT XBSDB_ARRAY_SIZE(XNET_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/XOnline_OOVPA.inl b/OOVPADatabase/XOnline_OOVPA.inl
@@ -86,6 +86,6 @@ OOVPATable XONLINES_OOVPAV2[] = {
 // ******************************************************************
 // * XONLINES_OOVPA_COUNT
 // ******************************************************************
-#define XONLINES_OOVPA_COUNT OOVPA_TABLE_COUNT(XONLINES_OOVPAV2)
+#define XONLINES_OOVPA_COUNT XBSDB_ARRAY_SIZE(XONLINES_OOVPAV2)
 
 #endif
diff --git a/OOVPADatabase/Xapi_OOVPA.inl b/OOVPADatabase/Xapi_OOVPA.inl
@@ -250,6 +250,6 @@ OOVPATable XAPILIB_OOVPAV2[] = {
 // ******************************************************************
 // * XAPILIB_OOVPA_COUNT
 // ******************************************************************
-#define XAPILIB_OOVPA_COUNT OOVPA_TABLE_COUNT(XAPILIB_OOVPAV2)
+#define XAPILIB_OOVPA_COUNT XBSDB_ARRAY_SIZE(XAPILIB_OOVPAV2)
 
 #endif
diff --git a/XbSymbolDatabase.c b/XbSymbolDatabase.c
@@ -148,7 +148,7 @@ SymbolDatabaseList SymbolDBList[] = {
 // ******************************************************************
 // * SymbolDBListCount
 // ******************************************************************
-const unsigned int SymbolDBListCount = OOVPA_TABLE_COUNT(SymbolDBList);
+const unsigned int SymbolDBListCount = XBSDB_ARRAY_SIZE(SymbolDBList);
 
 // ******************************************************************
 // * XRefDataBase