From 015aba2974354f0c29784f530905a28600b18919 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 3 Oct 2022 10:15:34 +0200 Subject: [PATCH] Patch level : 12.0 nopatch Files correlati : Commento: Modificata get_mask in _get_mask --- src/lv/lv0400.cpp | 2 +- src/lv/lv0500.cpp | 2 +- src/lv/lv4200.cpp | 3 ++- src/lv/lv4500.cpp | 1 - src/lv/lv4600.cpp | 2 +- src/lv/lv4700.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lv/lv0400.cpp b/src/lv/lv0400.cpp index bfaf5c980..a0c1e6d6e 100755 --- a/src/lv/lv0400.cpp +++ b/src/lv/lv0400.cpp @@ -950,7 +950,7 @@ private: int find_art(TSheet_field& s,const TString& art) const; protected: - virtual TMask* get_mask (int mode) {return _msk; } + virtual TMask* _get_mask (int mode) {return _msk; } virtual TRelation* get_relation() const {return _rel;} virtual bool user_create(); diff --git a/src/lv/lv0500.cpp b/src/lv/lv0500.cpp index ba3679b14..79cc490c0 100755 --- a/src/lv/lv0500.cpp +++ b/src/lv/lv0500.cpp @@ -100,7 +100,7 @@ protected: virtual int write(const TMask& m); virtual int rewrite(const TMask& m); virtual bool remove(); - virtual TMask* get_mask(int mode) { return _mask; } + virtual TMask* _get_mask(int mode) { return _mask; } virtual bool changing_mask(int mode) { return false; } public: diff --git a/src/lv/lv4200.cpp b/src/lv/lv4200.cpp index e8da255ea..d743f0f93 100755 --- a/src/lv/lv4200.cpp +++ b/src/lv/lv4200.cpp @@ -8,6 +8,7 @@ #include #include +#include "../cg/cglib.h" #include "../cg/cgsaldac.h" #include "lv4.h" @@ -63,7 +64,7 @@ const TCausale& TCausali_cache::causale(const char tipocf, tipo_movimento tm) { // Metodo bastardo per evitare TToken_string temporanee "a randa" // creo chiave a lunghezza fissa TIPOCF+TIPOMOV+ANNO = C12010 - const char key[4] = { tipocf, '0'+tm, '\0' }; + const char key[4] = { tipocf, '0'+(char) tm, '\0' }; return *(const TCausale*)objptr(key); } diff --git a/src/lv/lv4500.cpp b/src/lv/lv4500.cpp index 2709a5062..55e4644bc 100755 --- a/src/lv/lv4500.cpp +++ b/src/lv/lv4500.cpp @@ -18,7 +18,6 @@ #include "../ce/cespi.h" #include "../ce/salce.h" #include "../cg/cglib.h" - #include "lv4.h" #include "lv4100.h" #include "lv4500a.h" diff --git a/src/lv/lv4600.cpp b/src/lv/lv4600.cpp index 6b901f47c..fd4101844 100755 --- a/src/lv/lv4600.cpp +++ b/src/lv/lv4600.cpp @@ -42,7 +42,7 @@ class TCGRiclass_application : public TRelation_application // @access Protected Member protected: - virtual TMask* get_mask(int mode = MODE_QUERY) { CHECK(_msk, "Null mask"); return _msk; } + virtual TMask* _get_mask(int mode = MODE_QUERY) { CHECK(_msk, "Null mask"); return _msk; } // @cmember Indica se la futura ritornera' una maschera diversa // dalla corrente. virtual bool changing_mask(int mode) { return false; } diff --git a/src/lv/lv4700.cpp b/src/lv/lv4700.cpp index 40d59ec3b..11c040fdf 100755 --- a/src/lv/lv4700.cpp +++ b/src/lv/lv4700.cpp @@ -76,7 +76,7 @@ bool TCOGECO_multirel_app::user_create() if (ok) { TConfig config(CONFIG_DITTA); - TMask & m = *get_mask(); + TMask & m = *get_mask(MODE_QUERY); set_search_field(F_CODTAB); }