From f3c7cb1e11e65975abd2f07267040d69a07b0e45 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 28 Dec 1994 15:01:04 +0000
Subject: [PATCH] Risolti conflitti

git-svn-id: svn://10.65.10.50/trunk@800 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/checks.h | 62 ------------------------------------------------
 include/isam.cpp | 22 +++++++++--------
 include/mask.cpp | 10 +++++++-
 3 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/include/checks.h b/include/checks.h
index b17aa5f06..f600ed94e 100755
--- a/include/checks.h
+++ b/include/checks.h
@@ -1,4 +1,3 @@
-<<<<<<< checks.h
 #ifndef __CHECKS_H
 #define __CHECKS_H
 
@@ -58,64 +57,3 @@ extern "C" {
 /* @END */
 
 #endif // __CHECKS_H
-=======
-#ifndef __CHECKS_H
-#define __CHECKS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* @FPUB */
-int message_box(const char* fmt, ...);
-int warning_box(const char* fmt, ...);
-int sorry_box(const char* fmt, ...);
-int error_box(const char* fmt, ...);
-int fatal_box(const char* fmt, ...);
-int yesno_box(const char* fmt, ...);
-int yesnocancel_box(const char* fmt, ...);
-int yesnofatal_box(const char* fmt, ...);
-int __trace(const char* fmt, ...);
-
-/* @END  */
-#ifdef __cplusplus
-}
-#endif
-
-
-/* @M 
-Utilizzate in fase di debug (definire il simbolo DBG in compilazione)
-*/
-#ifdef DBG
-#define CHECK(p, m) ( (p) ? (void)0 : (void) fatal_box(          \
-			  "Check failed in %s, line %d:\n\r%s",      \
-			  __FILE__, __LINE__, m) )
-
-#define CHECKS(p, m, s0) ( (p) ? (void)0 : (void) fatal_box(      \
-		    "Check failed in %s, line %d:\n\r%s%s", \
-		 __FILE__, __LINE__, m, s0) )
-
-#define CHECKD(p, m, d0) ( (p) ? (void)0 : (void) fatal_box(      \
-			  "Check failed in %s, line %d:\n\r%s%d", \
-			    __FILE__, __LINE__, m, d0) )
-#else
-
-#define CHECK(p, m)
-#define CHECKS(p, m, s)
-#define CHECKD(p, m, d)
-
-#endif
-/* @END */
-
-
-/* @M
-Utilizzata in fase di debug (definire il simbolo TRC in compilazione)
-*/
-#ifdef TRC
-#define TRACE __trace
-#else
-#define TRACE 1 ? 0 : __trace
-#endif
-/* @END */
-
-#endif // __CHECKS_H
->>>>>>> 1.3
diff --git a/include/isam.cpp b/include/isam.cpp
index ddfbdd525..2c0bb63ab 100755
--- a/include/isam.cpp
+++ b/include/isam.cpp
@@ -95,9 +95,12 @@ TBaseisamfile::TBaseisamfile(int logicnum, bool linkrecinst)
   }
 
   r.get(logicnum);
-  _historicfile = ((r.field(RFLD_SYS_DATE) != FIELDERR) &&
-                   (r.field(RFLD_SYS_FIRST) != FIELDERR) &&
-                   (r.field(RFLD_SYS_LAST) != FIELDERR));
+  /*  
+     _historicfile = ((r.field(RFLD_SYS_DATE) != FIELDERR) &&
+     (r.field(RFLD_SYS_FIRST) != FIELDERR) &&
+     (r.field(RFLD_SYS_LAST) != FIELDERR));
+     */                   
+  _historicfile = FALSE; 
 }
 
 
@@ -126,10 +129,12 @@ int TBaseisamfile::gethr(TRectype& rec, TDate& atdate)
     atdate = eotime;
     return NOERR;
   }
-  TRectype                wr(rec);
+  TRectype                wr(rec);              
+  
   TRecfield               flf(wr, RFLD_SYS_FIRST),
   fll(wr, RFLD_SYS_LAST),
   fd1(wr, RFLD_SYS_DATE);
+  
   TDate                           d1;
   TRecnotype      wr0 = -1L, wr1 = -1L;
   
@@ -1827,13 +1832,10 @@ void TRectype::zero(char c)
   NOT_LINKED(_i, "zero");
   recall();
   memset(_rec + 1, c, len() - 1);
+
   if (_cod != NULL)
-    *_cod = _tab;
-  if (exist(RFLD_SYS_FIRST))
-  {
-    put(RFLD_SYS_FIRST, "-1");
-    put(RFLD_SYS_LAST, "-1");
-  }
+    *_cod = _tab;  
+
   setempty(TRUE);
 }
 
diff --git a/include/mask.cpp b/include/mask.cpp
index b6f8a78ee..c1dab76b9 100755
--- a/include/mask.cpp
+++ b/include/mask.cpp
@@ -870,7 +870,15 @@ WINDOW TMask::read_page(TScanner& scanner, bool toolbar)
   while (scanner.popkey() != "EN")
   {
     TMask_field* f = parse_field(scanner);
-    CHECK(f, "Can't create a control");
+#ifdef DBG    
+    if (f == NULL) 
+    {     
+      const int f = fields();
+      TString256 e("Unknown control at pos."); e << f;
+      if (f) e << ". Last good was " << fld(f-1).dlg() << ": " << fld(f-1).prompt();
+      fatal_box(e);
+    }  
+#endif    
     f->construct(scanner, w);
     _field.add(f);
   }