atdna-test fix

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

View File

@ -65,6 +65,7 @@ add_library(athena-core
include/athena/MemoryReader.hpp
include/athena/MemoryWriter.hpp
include/athena/Checksums.hpp
include/athena/ChecksumsLiterals.hpp
include/athena/Compression.hpp
include/athena/Socket.hpp
include/LZ77/LZBase.hpp
@ -75,6 +76,10 @@ add_library(athena-core
include/athena/Dir.hpp
include/athena/DNA.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/utf8proc.h
include/optional.hpp

View File

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

View File

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

View File

@ -1,5 +1,5 @@
#ifndef AT_OP_HPP
#define AT_OP_HPP
#ifndef AT_DNAOP_HPP
#define AT_DNAOP_HPP
#include "IStreamReader.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__)
#endif // AT_OP_HPP
#endif // AT_DNAOP_HPP