From abfd8beb3786e971d100a16884291ab593c5f716 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 21 Mar 2008 10:07:58 +0000 Subject: [PATCH] Patch level : 4.0 911 Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 3.2 1010 git-svn-id: svn://10.65.10.50/trunk@16358 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/isam.cpp | 1 - include/netsock.cpp | 2 +- include/reprint.cpp | 2 +- include/textset.cpp | 12 ------------ 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/include/isam.cpp b/include/isam.cpp index 059860988..7edff9d49 100755 --- a/include/isam.cpp +++ b/include/isam.cpp @@ -2115,7 +2115,6 @@ int TSystemisamfile::update( int newfields = wfields; //numero campi del nuovo file compresi quelli personalizzati (_) TToken_string def; //riga del file .trr nome|tipo|lungh|dec - const int oldfields = oldrec.fields(); for (int j = 0; j < oldfields; j++) { def = oldrec.fielddef(j); diff --git a/include/netsock.cpp b/include/netsock.cpp index fb43fc52a..85202503b 100755 --- a/include/netsock.cpp +++ b/include/netsock.cpp @@ -1101,7 +1101,7 @@ bool TSocketClient::HttpPostFile(CONNID id, const char* remote, const char* loca return ok; } -Vstatic bool FtpSendCommand(TSocket_connection& conn, const char* cmd, const char* param, TString* line) +static bool FtpSendCommand(TSocket_connection& conn, const char* cmd, const char* param, TString* line) { TString command = cmd; if (param && *param) diff --git a/include/reprint.cpp b/include/reprint.cpp index 2d387f32f..eb6e1aed6 100755 --- a/include/reprint.cpp +++ b/include/reprint.cpp @@ -2650,7 +2650,7 @@ bool TReport_book::can_merge(int pages) const return TBook::can_merge(pages); } -bool TReport_book::print(size_t pagefrom, size_t pageto, size_t copies) +bool TReport_book::print(size_t pagefrom, size_t pageto, word copies) { if (pages() <= 0) return false; diff --git a/include/textset.cpp b/include/textset.cpp index 3cb45fc36..6761ebd93 100755 --- a/include/textset.cpp +++ b/include/textset.cpp @@ -566,18 +566,6 @@ const TVariant& TAS400_recordset::get(unsigned int column) const return TText_recordset::get(column); } -const TVariant& TAS400_recordset::get(const char* column) const -{ - const TArray* info = (const TArray*)_trc.objptr(rec_type()); - if (info) - { - const TAS400_column_info* ci = ((TAS400_recordset*)this)->parse_field(column, c, false); - if (ci != NULL) - return get_field(*ci); - } - return TText_recordset::get(column); -} - const TVariant& TAS400_recordset::get(const char* column) const { if (column && *column != '#')