[openjk] 32/130: Make ctor & dtor inline Add methods from interface into implementation's namespace

Simon McVittie smcv at debian.org
Fri Oct 28 11:09:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit a467c5137c84d32a46249c6ef3edab3bd6c3da96
Author: bibendovsky <bibendovsky at hotmail.com>
Date:   Sun Jul 10 20:57:46 2016 +0300

    Make ctor & dtor inline
    Add methods from interface into implementation's namespace
---
 shared/qcommon/ojk_i_saved_game.h |  6 +++---
 shared/qcommon/ojk_saved_game.h   | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/shared/qcommon/ojk_i_saved_game.h b/shared/qcommon/ojk_i_saved_game.h
index 368b7bd..f7970f3 100644
--- a/shared/qcommon/ojk_i_saved_game.h
+++ b/shared/qcommon/ojk_i_saved_game.h
@@ -18,11 +18,11 @@ namespace ojk {
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 // Class stuff
 
-ISavedGame::ISavedGame()
+inline ISavedGame::ISavedGame()
 {
 }
 
-ISavedGame::~ISavedGame()
+inline ISavedGame::~ISavedGame()
 {
 }
 
@@ -298,7 +298,7 @@ void ISavedGame::read(
     int dst_count,
     InplaceTag)
 {
-    constexpr auto dst_size = dst_count * static_cast<int>(sizeof(TDst));
+    const auto dst_size = dst_count * static_cast<int>(sizeof(TDst));
 
     raw_read(
         dst_values,
diff --git a/shared/qcommon/ojk_saved_game.h b/shared/qcommon/ojk_saved_game.h
index e108a29..c9085e1 100644
--- a/shared/qcommon/ojk_saved_game.h
+++ b/shared/qcommon/ojk_saved_game.h
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <string>
 #include <vector>
-#include "ojk_i_saved_game_fwd.h"
+#include "ojk_i_saved_game.h"
 
 
 namespace ojk {
@@ -59,21 +59,31 @@ public:
     bool read_chunk(
         const ChunkId chunk_id) override;
 
+    using ISavedGame::read_chunk;
+
+
     // Writes a chunk into the file from the internal buffer.
     bool write_chunk(
         const ChunkId chunk_id) override;
 
+    using ISavedGame::write_chunk;
+
 
     // Reads a raw data from the internal buffer.
     void raw_read(
         void* dst_data,
         int dst_size) override;
 
+    using ISavedGame::read;
+
+
     // Writes a raw data into the internal buffer.
     void raw_write(
         const void* src_data,
         int src_size) override;
 
+    using ISavedGame::write;
+
 
     // Returns an I/O buffer.
     const Buffer& get_buffer() const override;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git



More information about the Pkg-games-commits mailing list