From 6c13f5d14cf192c6570b4cc5aeec69b426a2c8f2 Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Thu, 6 Jul 2017 19:50:15 +0200
Subject: [PATCH] fix odbc build on linux

---
 Data/ODBC/testsuite/src/SQLExecutor.cpp |  1 -
 Data/ODBC/testsuite/src/SQLExecutor.h   | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp
index 0791909a4..7a76abb2d 100644
--- a/Data/ODBC/testsuite/src/SQLExecutor.cpp
+++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp
@@ -14,7 +14,6 @@
 #include "SQLExecutor.h"
 #include "Poco/String.h"
 #include "Poco/Format.h"
-#include "Poco/Tuple.h"
 #include "Poco/Nullable.h"
 #include "Poco/Any.h"
 #include "Poco/Dynamic/Var.h"
diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h
index 137f3e342..2e70df051 100644
--- a/Data/ODBC/testsuite/src/SQLExecutor.h
+++ b/Data/ODBC/testsuite/src/SQLExecutor.h
@@ -25,6 +25,7 @@
 #include "Poco/Data/RecordSet.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/String.h"
+#include "Poco/Tuple.h"
 #include "Poco/Exception.h"
 #include <iostream>
 
@@ -564,18 +565,23 @@ public:
 
 	template <typename IntType =
 #ifdef POCO_64_BIT
-		Poco::Int64 IntType
+		Poco::Int64
 #else
-		Poco::Int32 IntType
+		Poco::Int32
 #endif
 	>
 	void internalExtraction(IntType)
 	{
 		using Poco::Data::RecordSet;
 		using Poco::Data::Column;
+		using Poco::Data::Statement;
 		using Poco::UTF16String;
+		using Poco::Tuple;
 		using Poco::BadCastException;
 		using Poco::RangeException;
+		using Poco::Data::ODBC::ConnectionException;
+		using Poco::Data::ODBC::StatementException;
+		using namespace Poco::Data::Keywords;
 
 		std::string funct = "internalExtraction()";
 		std::vector<Tuple<int, double, std::string> > v;
@@ -653,8 +659,8 @@ public:
 			assert (5 == i);
 
 			const Column<std::deque<IntType> >& col = rset.column<std::deque<IntType> >(0);
-			Column<std::deque<IntType> >::Iterator it = col.begin();
-			Column<std::deque<IntType> >::Iterator end = col.end();
+			typename Column<std::deque<IntType> >::Iterator it = col.begin();
+			typename Column<std::deque<IntType> >::Iterator end = col.end();
 			for (int i = 1; it != end; ++it, ++i)
 				assert (*it == i);