ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix includes, fix naming convention

Browse Source
This commit is contained in:
Christopher Lackner 2018-12-12 11:24:11 +01:00
parent 83df85f274
commit 814d75d1c7
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/core/archive.cpp
View File

@ -1,10 +1,4 @@
#include <bits/std_function.h> // for function
#include <stdexcept> // for runtime_error
#include <type_traits> // for declval, enable_if, false_type, is_co...
#include <typeinfo> // for type_info
#include <utility> // for move, swap, pair
#include "archive.hpp" #include "archive.hpp"
#ifndef WIN32 #ifndef WIN32

10
libsrc/core/archive.hpp
View File

@ -129,7 +129,7 @@ namespace ngcore
bool Output () const { return is_output; } bool Output () const { return is_output; }
bool Input () const { return !is_output; } bool Input () const { return !is_output; }
virtual const VersionInfo& getVersion(const std::string& library) = 0; virtual const VersionInfo& GetVersion(const std::string& library) = 0;
// Pure virtual functions that have to be implemented by In-/OutArchive // Pure virtual functions that have to be implemented by In-/OutArchive
virtual Archive & operator & (double & d) = 0; virtual Archive & operator & (double & d) = 0;
@ -525,7 +525,7 @@ namespace ngcore
BinaryOutArchive& operator=(const BinaryOutArchive&) = delete; BinaryOutArchive& operator=(const BinaryOutArchive&) = delete;
BinaryOutArchive& operator=(BinaryOutArchive&&) = delete; BinaryOutArchive& operator=(BinaryOutArchive&&) = delete;
const VersionInfo& getVersion(const std::string& library) override const VersionInfo& GetVersion(const std::string& library) override
{ return GetLibraryVersions()[library]; } { return GetLibraryVersions()[library]; }
using Archive::operator&; using Archive::operator&;
@ -601,7 +601,7 @@ namespace ngcore
BinaryInArchive (const std::string& filename) BinaryInArchive (const std::string& filename)
: BinaryInArchive(std::make_shared<std::ifstream>(filename)) { ; } : BinaryInArchive(std::make_shared<std::ifstream>(filename)) { ; }
const VersionInfo& getVersion(const std::string& library) override const VersionInfo& GetVersion(const std::string& library) override
{ return vinfo[library]; } { return vinfo[library]; }
using Archive::operator&; using Archive::operator&;
@ -669,7 +669,7 @@ namespace ngcore
TextOutArchive (const std::string& filename) : TextOutArchive (const std::string& filename) :
TextOutArchive(std::make_shared<std::ofstream>(filename)) { } TextOutArchive(std::make_shared<std::ofstream>(filename)) { }
const VersionInfo& getVersion(const std::string& library) override const VersionInfo& GetVersion(const std::string& library) override
{ return GetLibraryVersions()[library]; } { return GetLibraryVersions()[library]; }
using Archive::operator&; using Archive::operator&;
@ -725,7 +725,7 @@ namespace ngcore
TextInArchive (const std::string& filename) TextInArchive (const std::string& filename)
: TextInArchive(std::make_shared<std::ifstream>(filename)) {} : TextInArchive(std::make_shared<std::ifstream>(filename)) {}
const VersionInfo& getVersion(const std::string& library) override const VersionInfo& GetVersion(const std::string& library) override
{ return vinfo[library]; } { return vinfo[library]; }
using Archive::operator&; using Archive::operator&;

4
tests/catch/archive.cpp
View File

@ -239,8 +239,8 @@ void testMultipleInheritance(Archive& in, Archive& out)
void testLibraryVersion(Archive& in, Archive& out) void testLibraryVersion(Archive& in, Archive& out)
{ {
SetLibraryVersion("netgen","v6.2.1812"); SetLibraryVersion("netgen","v6.2.1812");
CHECK(in.getVersion("netgen") == "v6.2.1811"); CHECK(in.GetVersion("netgen") == "v6.2.1811");
CHECK(out.getVersion("netgen") == "v6.2.1812"); CHECK(out.GetVersion("netgen") == "v6.2.1812");
} }
void testArchive(Archive& in, Archive& out) void testArchive(Archive& in, Archive& out)