fix: g++ and clang build #2808

pocoproject · Oct 12, 2024 · 086db54 · 086db54
1 parent 3c1abed
commit 086db54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h
@@ -19,9 +19,11 @@
 #include "Poco/Data/Session.h"
 #include "Poco/Data/BulkExtraction.h"
 #include "Poco/Data/BulkBinding.h"
+#include "Poco/Data/RecordSet.h"
 #include "Poco/Exception.h"
 #include <iostream>
 
+using namespace Poco::Data::Keywords;
 
 namespace Poco {
 namespace Data {
@@ -325,18 +327,18 @@ class DataTest_API SQLExecutor: public CppUnit::TestCase
 		assertTrue(d.isNull());
 
 		sql = "SELECT * FROM NullableTest";
-		RecordSet rs(session(), sql);
+		Poco::Data::RecordSet rs(session(), sql);
 
 		rs.moveFirst();
 		assertTrue(rs.isNull("EmptyString"));
 		assertTrue(rs.isNull("EmptyInteger"));
 		assertTrue(rs.isNull("EmptyFloat"));
 		assertTrue(rs.isNull(emptyName));
 
-		Var di = 1;
-		Var df = 1.5;
-		Var ds = "abc";
-		Var dd = T();
+		Poco::Dynamic::Var di = 1;
+		Poco::Dynamic::Var df = 1.5;
+		Poco::Dynamic::Var ds = "abc";
+		Poco::Dynamic::Var dd = T();
 
 		assertTrue(!di.isEmpty());
 		assertTrue(!df.isEmpty());

diff --git a/Data/DataTest/src/SQLExecutor.cpp b/Data/DataTest/src/SQLExecutor.cpp
@@ -32,7 +32,6 @@
 #include "Poco/Data/Session.h"
 #include "Poco/Data/SessionPool.h"
 #include "Poco/Data/StatementImpl.h"
-#include "Poco/Data/RecordSet.h"
 #include "Poco/Data/RowIterator.h"
 #include "Poco/Data/RowFilter.h"
 #include "Poco/Data/BulkExtraction.h"
@@ -46,7 +45,6 @@
 #include <iterator>
 
 
-using namespace Poco::Data::Keywords;
 using Poco::Data::Session;
 using Poco::Data::SessionPool;
 using Poco::Data::Statement;