[Firebird-checkins] CVS: firebird2/src/jrd build_no.h,1.3022.2.38,1.3022.2.39 evl.cpp,1.34.2.6,1.34.2.7

[Nickolay S. <sk...@us...>]

Build Version :  T2.0.0.8330 Firebird 2.0 UNSTABLE

(writeBuildNum.sh,v 1.8331 2004/09/18 05:32:08 skidder Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12805/src/jrd

Modified Files:
      Tag: B1_5_Release
	build_no.h evl.cpp 
Log Message:
Backport fix for the broken CURRENT_TIMESTAMP issue on 64-bit platforms

Index: build_no.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/build_no.h,v
retrieving revision 1.3022.2.38
retrieving revision 1.3022.2.39
diff -b -U3 -r1.3022.2.38 -r1.3022.2.39
--- build_no.h	6 Jul 2004 13:12:05 -0000	1.3022.2.38
+++ build_no.h	18 Sep 2004 05:32:04 -0000	1.3022.2.39
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:4500 
+  FORMAL BUILD NUMBER:4550 
 */
 
-#define PRODUCT_VER_STRING "1.5.1.4500"
-#define FILE_VER_STRING "WI-V1.5.1.4500"
-#define LICENSE_VER_STRING "WI-V1.5.1.4500"
-#define FILE_VER_NUMBER 1, 5, 1, 4500
+#define PRODUCT_VER_STRING "1.5.2.4550"
+#define FILE_VER_STRING "WI-V1.5.2.4550"
+#define LICENSE_VER_STRING "WI-V1.5.2.4550"
+#define FILE_VER_NUMBER 1, 5, 2, 4550
 #define FB_MAJOR_VER "1"
 #define FB_MINOR_VER "5"
-#define FB_REV_NO "1"
-#define FB_BUILD_NO "4500"
+#define FB_REV_NO "2"
+#define FB_BUILD_NO "4550"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 1.5"

Index: evl.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/evl.cpp,v
retrieving revision 1.34.2.6
retrieving revision 1.34.2.7
diff -b -U3 -r1.34.2.6 -r1.34.2.7
--- evl.cpp	29 Mar 2004 07:40:25 -0000	1.34.2.6
+++ evl.cpp	18 Sep 2004 05:32:06 -0000	1.34.2.7
@@ -898,7 +898,7 @@
 	case nod_current_date:
 	case nod_current_timestamp:
 		{
-			ULONG clock;
+			time_t clock;
 			struct tm times;
 			GDS_TIMESTAMP enc_times;
 
@@ -911,7 +911,7 @@
 				assert(FALSE);
 				clock = time(0);
 			}
-			times = *localtime(reinterpret_cast < time_t * >(&clock));
+			times = *localtime(&clock);
 
 			memset(&impure->vlu_desc, 0, sizeof(impure->vlu_desc));
 			impure->vlu_desc.dsc_address =