diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h index 0d3c38e34..c38cd06ff 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h @@ -173,7 +173,6 @@ public: void bind(std::size_t pos, const std::list& val, Direction dir); /// Binds an UInt64 list. -#ifndef POCO_LONG_IS_64_BIT void bind(std::size_t pos, const long& val, Direction dir); /// Binds a long. @@ -188,7 +187,6 @@ public: void bind(std::size_t pos, const std::list& val, Direction dir); /// Binds a long list. -#endif void bind(std::size_t pos, const bool& val, Direction dir); /// Binds a boolean. @@ -1215,7 +1213,6 @@ inline void Binder::bind(std::size_t pos, const std::list& val, Di } -#ifndef POCO_LONG_IS_64_BIT inline void Binder::bind(std::size_t pos, const long& val, Direction dir) { bindImpl(pos, val, SQL_C_SLONG, dir); @@ -1244,7 +1241,6 @@ inline void Binder::bind(std::size_t pos, const std::list& val, Direction { bindImplContainer(pos, val, SQL_C_SLONG, dir); } -#endif inline void Binder::bind(std::size_t pos, const float& val, Direction dir) diff --git a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h index f3ce016c3..cb22e0dfc 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h @@ -155,7 +155,6 @@ public: bool extract(std::size_t pos, std::list& val); /// Extracts an UInt64 list. -#ifndef POCO_LONG_IS_64_BIT bool extract(std::size_t pos, long& val); /// Extracts a long. @@ -170,7 +169,6 @@ public: bool extract(std::size_t pos, std::list& val); /// Extracts a long list. -#endif bool extract(std::size_t pos, bool& val); /// Extracts a boolean. diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h index aa38ea28c..80f4b762f 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h @@ -204,7 +204,6 @@ public: void prepare(std::size_t pos, const std::list& val); /// Prepares an UInt64 list. -#ifndef POCO_LONG_IS_64_BIT void prepare(std::size_t pos, const long& val); /// Prepares a long. @@ -219,7 +218,6 @@ public: void prepare(std::size_t pos, const std::list& val); /// Prepares a long list. -#endif void prepare(std::size_t pos, const bool& val); /// Prepares a boolean. @@ -877,7 +875,6 @@ inline void Preparator::prepare(std::size_t pos, const std::list& } -#ifndef POCO_LONG_IS_64_BIT inline void Preparator::prepare(std::size_t pos, const long&) { prepareFixedSize(pos, SQL_C_SLONG); @@ -906,7 +903,6 @@ inline void Preparator::prepare(std::size_t pos, const std::list& val) { prepareFixedSize(pos, SQL_C_SLONG, val.size()); } -#endif inline void Preparator::prepare(std::size_t pos, const bool&) diff --git a/Data/ODBC/src/Extractor.cpp b/Data/ODBC/src/Extractor.cpp index 046e3e30a..c4cbb9fed 100644 --- a/Data/ODBC/src/Extractor.cpp +++ b/Data/ODBC/src/Extractor.cpp @@ -575,7 +575,6 @@ bool Extractor::extract(std::size_t pos, std::list& val) } -#ifndef POCO_LONG_IS_64_BIT bool Extractor::extract(std::size_t pos, long& val) { if (Preparator::DE_MANUAL == _dataExtraction) @@ -619,7 +618,6 @@ bool Extractor::extract(std::size_t pos, std::list& val) else throw InvalidAccessException("Direct container extraction only allowed for bound mode."); } -#endif bool Extractor::extract(std::size_t pos, double& val)