From dd421f9195bbd66228b40622fe83da1a0d410ca6 Mon Sep 17 00:00:00 2001 From: robocop Date: Tue, 10 Apr 2012 01:40:30 +0000 Subject: [PATCH] Misc. --- src/common/cvt.cpp | 4 ++-- src/common/isc_file.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/cvt.cpp b/src/common/cvt.cpp index fbb2985075..9df93874a2 100644 --- a/src/common/cvt.cpp +++ b/src/common/cvt.cpp @@ -1828,7 +1828,7 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb) break; case dtype_timestamp: - cb->isVersion4(version4); + cb->isVersion4(version4); // Used in the conversion to text some lines below. Firebird::TimeStamp::decode_timestamp(*(GDS_TIMESTAMP *) from->dsc_address, ×, &fractions); break; @@ -1866,7 +1866,7 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb) // Put in a space to separate date & time components - if ((from->dsc_dtype == dtype_timestamp) && (!version4)) + if (from->dsc_dtype == dtype_timestamp && !version4) *p++ = ' '; // Add the time part for data types that include it diff --git a/src/common/isc_file.cpp b/src/common/isc_file.cpp index c4aa3fc643..c6f35662df 100644 --- a/src/common/isc_file.cpp +++ b/src/common/isc_file.cpp @@ -1656,7 +1656,7 @@ namespace { class IConv { public: - IConv(MemoryPool& p) + explicit IConv(MemoryPool& p) : toBuf(p) { #ifdef HAVE_LANGINFO_H