From 9befe6abcbcbc48a0279b932f19542fdc246991a Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de> Date: Wed, 23 Dec 2015 11:30:55 +0100 Subject: [PATCH] simplify mem.*: there was no need for overloadeding mem_store --- pub/lib/mem.cpp | 3 --- pub/lib/mem.hpp | 14 ++++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pub/lib/mem.cpp b/pub/lib/mem.cpp index b45c64eb..90ee57cd 100644 --- a/pub/lib/mem.cpp +++ b/pub/lib/mem.cpp @@ -290,9 +290,6 @@ namespace NOlm { } } - void mem_store( POld fd, int k ) { mem_store( (POlo)fd, k ); } - void mem_store( POlc fc, int k ) { mem_store( (POlo)fc, k ); } - //! Remove selected files from online memory. void mem_del() { diff --git a/pub/lib/mem.hpp b/pub/lib/mem.hpp index b0182223..dfaad7d8 100644 --- a/pub/lib/mem.hpp +++ b/pub/lib/mem.hpp @@ -1,7 +1,7 @@ //************************************************************************************************** -//* FRIDA: fast reliable interactive data analysis -//* (C) Joachim Wuttke 1990-, v2(C++) 2001- -//* http://apps.jcns.fz-juelich.de/frida +//* FRIDA: fast reliable interactive data analysis +//* (C) Joachim Wuttke 1990-, v2(C++) 2001- +//* http://apps.jcns.fz-juelich.de/frida //************************************************************************************************** //! \file mem.hpp @@ -16,11 +16,9 @@ namespace NOlm { POld mem_get_D( int k ); POlc mem_get_C( int k ); int mem_size(); - + // Modify online memory (file selection is changed accordingly): void mem_store( POlo olo, int k=-1 ); - void mem_store( POld old, int k=-1 ); - void mem_store( POlc olc, int k=-1 ); void mem_del(); void mem_del( int k ); void mem_xchange(); @@ -57,12 +55,12 @@ namespace NOlm { int size() const; }; - //! Bit values of 'mode' parameter in IterateO constructor. + //! Bit values of 'mode' parameter in IterateO constructor. const int IterALL = 1; ///< select all online files const int IterTOL = 2; ///< tolerate empty selection //! Iterate over data files in selection. - class IterateD : public IterateO { + class IterateD : public IterateO { public: POld operator()(); int size() const; -- GitLab