libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-06-02 12:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

atdna-test fix

Browse Source
This commit is contained in:
Jack Andersen 2018-03-03 18:24:11 -10:00
parent a3f9629d44
commit 1d761d5160
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -65,6 +65,7 @@ add_library(athena-core
include/athena/MemoryReader.hpp include/athena/MemoryReader.hpp
include/athena/MemoryWriter.hpp include/athena/MemoryWriter.hpp
include/athena/Checksums.hpp include/athena/Checksums.hpp
include/athena/ChecksumsLiterals.hpp
include/athena/Compression.hpp include/athena/Compression.hpp
include/athena/Socket.hpp include/athena/Socket.hpp
include/LZ77/LZBase.hpp include/LZ77/LZBase.hpp
@ -75,6 +76,10 @@ add_library(athena-core
include/athena/Dir.hpp include/athena/Dir.hpp
include/athena/DNA.hpp include/athena/DNA.hpp
include/athena/DNAYaml.hpp include/athena/DNAYaml.hpp
include/athena/DNAOp.hpp
include/athena/YAMLCommon.hpp
include/athena/YAMLDocReader.hpp
include/athena/YAMLDocWriter.hpp
include/yaml.h include/yaml.h
include/utf8proc.h include/utf8proc.h
include/optional.hpp include/optional.hpp

2
atdna/test.cpp
View File

@ -1,7 +1,7 @@
#include "test.hpp" #include "test.hpp"
#include "athena/MemoryWriter.hpp" #include "athena/MemoryWriter.hpp"
#define EXPECTED_BYTES 265 #define EXPECTED_BYTES 281
int main(int argc, const char** argv) int main(int argc, const char** argv)
{ {

4
atdna/test.hpp
View File

@ -66,8 +66,8 @@ TESTFile : public BigDNA
Value<NestedTp> explSub1 = NestedVal; Value<NestedTp> explSub1 = NestedVal;
Value<Var32Tp> explSub2 = Var32Val; Value<Var32Tp> explSub2 = Var32Val;
}; };
TESTTemplateSubFile<atInt32, 36> nestedTemplate1; Value<TESTTemplateSubFile<atInt32, 36>> nestedTemplate1;
TESTTemplateSubFile<atInt64, 96> nestedTemplate2; Value<TESTTemplateSubFile<atInt64, 96>> nestedTemplate2;
Value<atUint32, Little> arrCount[2]; Value<atUint32, Little> arrCount[2];
Vector<atUint32, AT_DNA_COUNT(arrCount[0])> array; Vector<atUint32, AT_DNA_COUNT(arrCount[0])> array;

6
include/athena/DNAOp.hpp
View File

@ -1,5 +1,5 @@
#ifndef AT_OP_HPP #ifndef AT_DNAOP_HPP
#define AT_OP_HPP #define AT_DNAOP_HPP
#include "IStreamReader.hpp" #include "IStreamReader.hpp"
#include "IStreamWriter.hpp" #include "IStreamWriter.hpp"
@ -1273,4 +1273,4 @@ void __VA_ARGS__::Enumerate<athena::io::DNA<athena::Big>::WriteYaml>(typename Wr
} \ } \
AT_SUBSPECIALIZE_DNA(__VA_ARGS__) AT_SUBSPECIALIZE_DNA(__VA_ARGS__)
#endif // AT_OP_HPP #endif // AT_DNAOP_HPP