From 1745522f2ece27aa3ae5d81895405d1a6e82fd3e Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 10 Apr 2014 09:51:08 +0000
Subject: [PATCH] ODBC: Fixed for C++11

git-svn-id: svn://ultimatepp.org/upp/trunk@7212 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Util.h   | 1 +
 uppsrc/ODBC/ODBC.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/uppsrc/Core/Util.h b/uppsrc/Core/Util.h
index cbb2f392f..c2f365062 100644
--- a/uppsrc/Core/Util.h
+++ b/uppsrc/Core/Util.h
@@ -16,6 +16,7 @@ class TimeStop : Moveable<TimeStop> {
 
 public:
 	dword  Elapsed() const           { return GetTickCount() - starttime; }
+	double Seconds() const           { return (double)Elapsed() / 1000; }
 	String ToString() const;
 	void   Reset();
 
diff --git a/uppsrc/ODBC/ODBC.cpp b/uppsrc/ODBC/ODBC.cpp
index c42e11f51..20c7312ac 100644
--- a/uppsrc/ODBC/ODBC.cpp
+++ b/uppsrc/ODBC/ODBC.cpp
@@ -361,7 +361,7 @@ bool ODBCConnection::Execute()
 	if(!IsOk(SQLPrepare(session->hstmt, (SQLCHAR *)~statement, statement.GetCount())))
 		return false;
 	parse = false;
-	bparam = param;
+	bparam = pick(param);
 	param.Clear();
 	for(int i = 0; i < bparam.GetCount(); i++) {
 		Param& p = bparam[i];