From cbc5cd875417bbc1fc56ebc71f106bfab8d873a1 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 27 May 1998 10:52:51 +0000
Subject: [PATCH] varmask.h    Aggiunto costruttore vuoto varrec.*    
 Aggiustamenti minimi per compilare 32 bit

git-svn-id: svn://10.65.10.50/trunk@6696 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/varmask.h  | 7 +++++--
 include/varrec.cpp | 2 +-
 include/varrec.h   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/varmask.h b/include/varmask.h
index 5dfb16f03..652ad0c91 100755
--- a/include/varmask.h
+++ b/include/varmask.h
@@ -21,12 +21,12 @@ class TVariable_mask : public TMask
 protected:
   // @cmember Controlla se il campo <p fld_id> esiste
   bool present(short fld_id) const { return id2pos(fld_id) >= 0; }
+
+  TVariable_mask() : TMask () { }
     
 public:
   // @cmember Esegue il check e i messaggi sul campo <p fld_id> della maschera
   virtual void check_field( short fld_id );
-  // @cmember Costruttore (crea la maschera leggendo la descrizione dal file .msk)
-  TVariable_mask( const char* name, int num = 0, int max = MAX_PAGES);
   // @cmember Setta il campo con una stringa
   virtual void set(short fld_id, const char* str, bool hit=FALSE);
   // @cmember Ritorna il contenuto del campo <p fld_id> sotto forma di stringa
@@ -39,6 +39,9 @@ public:
   virtual void enable(short fld_id, bool on = TRUE);
   // @cmember Legge il campo da file
   virtual TMask_field* parse_field(TScanner& scanner);
+
+  // @cmember Costruttore (crea la maschera leggendo la descrizione dal file .msk)
+  TVariable_mask( const char* name, int num = 0, int max = MAX_PAGES);
   // @cmember Distruttore
   virtual ~TVariable_mask() {}
 };
diff --git a/include/varrec.cpp b/include/varrec.cpp
index 309f57c86..af81e7a3b 100755
--- a/include/varrec.cpp
+++ b/include/varrec.cpp
@@ -81,7 +81,7 @@ TString & TVariable_field::get() const
       const int items = _e->numvar();
       for  (int i = 0; i < items; i++)
         _e->setvar(i, _rec->get(_e->varname(i)));
-      v = *_e;
+      v = _e->as_string();
     }
     else                 
       if (_getfunc)
diff --git a/include/varrec.h b/include/varrec.h
index ecc196270..6c256e9bf 100755
--- a/include/varrec.h
+++ b/include/varrec.h
@@ -77,7 +77,7 @@ public:
 // @ cmember Costruttore con un variable_field 
   TVariable_field(const TVariable_field & f);
 // @ cmember Distruttore  
-  ~TVariable_field();
+  virtual ~TVariable_field();
 };