From f015557545aadc2472c1f2d2e4e38661aee8404a Mon Sep 17 00:00:00 2001 From: skidder Date: Thu, 11 Mar 2004 05:41:51 +0000 Subject: [PATCH] GCC doesn't consider double const a valid C++ --- src/jrd/opt.cpp | 2 +- src/jrd/par.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp index 98e0b4c5b2..f27cc69914 100644 --- a/src/jrd/opt.cpp +++ b/src/jrd/opt.cpp @@ -5230,7 +5230,7 @@ static void get_inactivities(Csb* csb, ULONG * dependencies) dependencies[n] = (ULONG) - 1; n = 0; Csb::rpt_itr tail = csb->csb_rpt.begin(); - for (const Csb::rpt_itr const end = tail + csb->csb_n_stream; + for (const Csb::rpt_itr end = tail + csb->csb_n_stream; tail < end; n++, tail++) { if (tail->csb_flags & csb_active) diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp index 4774568ea0..86f1a326ba 100644 --- a/src/jrd/par.cpp +++ b/src/jrd/par.cpp @@ -192,7 +192,7 @@ jrd_nod* PAR_blr(thread_db* tdbb, // AB: csb_n_stream replaced by view_csb->csb_rpt.getCount(), because there could // be more then just csb_n_stream-numbers that hold data. // Certainly csb_stream (see par_context where the context is retrieved) - const Csb::rpt_itr const end = view_csb->csb_rpt.end(); + const Csb::rpt_itr end = view_csb->csb_rpt.end(); for (stream = 0; ptr != end; ++ptr, ++stream) { t2 = CMP_csb_element(csb, stream); t2->csb_relation = ptr->csb_relation;