root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Risolti conflitti

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@800 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-12-28 15:01:04 +00:00
parent 93f11d23e6
commit f3c7cb1e11
3 changed files with 21 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
include/checks.h
View File

@ -1,4 +1,3 @@
<<<<<<< checks.h
#ifndef __CHECKS_H #ifndef __CHECKS_H
#define __CHECKS_H #define __CHECKS_H
@ -58,64 +57,3 @@ extern "C" {
/* @END */ /* @END */
#endif // __CHECKS_H #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

22
include/isam.cpp
View File

@ -95,9 +95,12 @@ TBaseisamfile::TBaseisamfile(int logicnum, bool linkrecinst)
} }
r.get(logicnum); r.get(logicnum);
_historicfile = ((r.field(RFLD_SYS_DATE) != FIELDERR) && /*
(r.field(RFLD_SYS_FIRST) != FIELDERR) && _historicfile = ((r.field(RFLD_SYS_DATE) != FIELDERR) &&
(r.field(RFLD_SYS_LAST) != 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; atdate = eotime;
return NOERR; return NOERR;
} }
TRectype wr(rec); TRectype wr(rec);
TRecfield flf(wr, RFLD_SYS_FIRST), TRecfield flf(wr, RFLD_SYS_FIRST),
fll(wr, RFLD_SYS_LAST), fll(wr, RFLD_SYS_LAST),
fd1(wr, RFLD_SYS_DATE); fd1(wr, RFLD_SYS_DATE);
TDate d1; TDate d1;
TRecnotype wr0 = -1L, wr1 = -1L; TRecnotype wr0 = -1L, wr1 = -1L;
@ -1827,13 +1832,10 @@ void TRectype::zero(char c)
NOT_LINKED(_i, "zero"); NOT_LINKED(_i, "zero");
recall(); recall();
memset(_rec + 1, c, len() - 1); memset(_rec + 1, c, len() - 1);
if (_cod != NULL) if (_cod != NULL)
*_cod = _tab; *_cod = _tab;
if (exist(RFLD_SYS_FIRST))
{
put(RFLD_SYS_FIRST, "-1");
put(RFLD_SYS_LAST, "-1");
}
setempty(TRUE); setempty(TRUE);
} }

10
include/mask.cpp
View File

@ -870,7 +870,15 @@ WINDOW TMask::read_page(TScanner& scanner, bool toolbar)
while (scanner.popkey() != "EN") while (scanner.popkey() != "EN")
{ {
TMask_field* f = parse_field(scanner); 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); f->construct(scanner, w);
_field.add(f); _field.add(f);
} }