libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace DNA_COUNT macro with AT_DNA_COUNT

This commit is contained in:
Jack Andersen 2018-02-24 22:22:35 -10:00
parent 17a0959dbd
commit 73a0ae0d00
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atdna/test.hpp
View File

@ -70,18 +70,18 @@ TESTFile : public BigDNA
TESTTemplateSubFile<atInt64, 96> nestedTemplate2;
Value<atUint32, Little> arrCount[2];
Vector<atUint32, DNA_COUNT(arrCount[0])> array;
Vector<atUint32, AT_DNA_COUNT(arrCount[0])> array;
Value<atUint32> arrAltCount;
Vector<atUint32, DNA_COUNT(arrAltCount)> arrayAlt;
Vector<atUint32, AT_DNA_COUNT(arrAltCount)> arrayAlt;
Seek<21, Current> seek;
Value<atUint32> arrCount2;
Vector<TESTSubFile<ETest::ZERO>, DNA_COUNT(arrCount[1] + arrCount2)> array2;
Vector<TESTSubFile<ETest::ZERO>, AT_DNA_COUNT(arrCount[1] + arrCount2)> array2;
Value<atUint32> bufSz;
Buffer<DNA_COUNT(bufSz)> buf;
Buffer<AT_DNA_COUNT(bufSz)> buf;
String<32> str;
WString<64> wstr;

4
include/athena/DNA.hpp
View File

@ -143,9 +143,9 @@ struct DNAVYaml : DNAV<DNAE>
/** Macro to supply count variable to atdna and mute it for other compilers */
#ifdef __clang__
#define DNA_COUNT(cnt) sizeof(cnt)
#define AT_DNA_COUNT(cnt) sizeof(cnt)
#else
#define DNA_COUNT(cnt) 0
#define AT_DNA_COUNT(cnt) 0
#endif
}