Merge branch 'master' into develop_kimkulling

pull/1871/head
Kim Kulling 2018-04-06 18:13:04 +02:00 committed by GitHub
commit 44c62042f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -283,7 +283,6 @@ public:
return *this;
}
private:
// ---------------------------------------------------------------------
/** Generic read method. ByteSwap::Swap(T*) *must* be defined */
template <typename T>
@ -300,6 +299,7 @@ private:
return f;
}
private:
// ---------------------------------------------------------------------
void InternBegin() {
if (!stream) {

View File

@ -255,8 +255,6 @@ public:
cursor = new_cursor;
}
private:
// ---------------------------------------------------------------------
/** Generic write method. ByteSwap::Swap(T*) *must* be defined */
template <typename T>