mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
e16cf98a5b
* [poco] pre 2.0.0 - Updated to the latest compiling commit - Added SQLite support - Added PDF support - Added MariaDB support - Added PostgreSQL support * Additional include files not part of any libraries * DataException is no more part of Poco::Data * [3fd] Patch 3fd to comply with poco-2.0.0pre
108 lines
4.0 KiB
Diff
108 lines
4.0 KiB
Diff
diff --git a/3FD/broker_impl_reader.cpp b/3FD/broker_impl_reader.cpp
|
|
index 98bd68a..d5948b5 100644
|
|
--- a/3FD/broker_impl_reader.cpp
|
|
+++ b/3FD/broker_impl_reader.cpp
|
|
@@ -185,7 +185,7 @@ namespace broker
|
|
|
|
core::Logger::Write(oss.str(), core::Logger::PRIO_INFORMATION);
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
CALL_STACK_TRACE;
|
|
std::ostringstream oss;
|
|
@@ -264,7 +264,7 @@ namespace broker
|
|
|
|
m_messages.reserve(msgCountStepLimit);
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
CALL_STACK_TRACE;
|
|
std::ostringstream oss;
|
|
@@ -317,7 +317,7 @@ namespace broker
|
|
{
|
|
core::Logger::Write(ex, core::Logger::PRIO_CRITICAL);
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to end transaction reading messages from broker queue. "
|
|
@@ -520,7 +520,7 @@ namespace broker
|
|
m_dbSession.rollback();
|
|
return true;
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to rollback transaction reading messages from broker queue. "
|
|
@@ -563,7 +563,7 @@ namespace broker
|
|
m_dbSession.commit();
|
|
return true;
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to commit transaction reading messages from broker queue. "
|
|
diff --git a/3FD/broker_impl_writer.cpp b/3FD/broker_impl_writer.cpp
|
|
index b237ba4..f9531c4 100644
|
|
--- a/3FD/broker_impl_writer.cpp
|
|
+++ b/3FD/broker_impl_writer.cpp
|
|
@@ -241,7 +241,7 @@ namespace broker
|
|
|
|
core::Logger::Write(oss.str(), core::Logger::PRIO_INFORMATION);
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
CALL_STACK_TRACE;
|
|
std::ostringstream oss;
|
|
@@ -348,7 +348,7 @@ namespace broker
|
|
{
|
|
core::Logger::Write(ex, core::Logger::PRIO_CRITICAL);
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to end transaction writing messages into broker queue. "
|
|
@@ -405,7 +405,7 @@ namespace broker
|
|
{
|
|
m_future->get();
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to write messages into broker queue. "
|
|
@@ -455,7 +455,7 @@ namespace broker
|
|
m_dbSession.rollback();
|
|
return true;
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to rollback transaction writing messages into broker queue. "
|
|
@@ -498,7 +498,7 @@ namespace broker
|
|
m_dbSession.commit();
|
|
return true;
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to commit transaction writing messages into broker queue. "
|
|
@@ -589,7 +589,7 @@ namespace broker
|
|
{
|
|
throw; // just forward exceptions from errors known to have been already handled
|
|
}
|
|
- catch (Poco::Data::DataException &ex)
|
|
+ catch (Poco::DataException &ex)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << "Failed to write messages into broker queue. "
|