Mercurial > hg > orthanc-databases

changeset 820:e0927885ff73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix MySQL and ODBC build
author Alain Mazy <am@orthanc.team>
date Tue, 02 Jun 2026 14:01:06 +0200
parents 55d6c6aeb19a
children a60cbe355d79
files Framework/MySQL/MySQLDatabase.cpp Framework/MySQL/MySQLParameters.cpp Framework/MySQL/MySQLResult.cpp Framework/MySQL/MySQLStatement.cpp Framework/MySQL/MySQLTransaction.cpp Framework/MySQL/MySQLTransaction.h Framework/Odbc/OdbcDatabase.cpp Framework/Odbc/OdbcEnvironment.cpp Framework/Odbc/OdbcPreparedStatement.cpp Framework/Odbc/OdbcResult.cpp Framework/Odbc/OdbcStatement.cpp MySQL/Plugins/MySQLIndex.cpp Odbc/Plugins/OdbcIndex.cpp
diffstat 13 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/MySQL/MySQLDatabase.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLDatabase.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -32,7 +32,7 @@
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 #include <Toolbox.h>
 
 #include <errmsg.h>
--- a/Framework/MySQL/MySQLParameters.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLParameters.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -26,7 +26,7 @@
 #include "MySQLDatabase.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 namespace OrthancDatabases
 {
--- a/Framework/MySQL/MySQLResult.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLResult.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -24,7 +24,7 @@
 #include "MySQLResult.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <errmsg.h>
 #include <mysqld_error.h>
--- a/Framework/MySQL/MySQLStatement.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLStatement.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -32,7 +32,7 @@
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <list>
 #include <memory>
--- a/Framework/MySQL/MySQLTransaction.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLTransaction.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -27,7 +27,7 @@
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <memory>
 
--- a/Framework/MySQL/MySQLTransaction.h	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/MySQL/MySQLTransaction.h	Tue Jun 02 14:01:06 2026 +0200
@@ -29,6 +29,7 @@
 
 #include "MySQLDatabase.h"
 #include "../Common/ITransaction.h"
+#include "../Common/OrthancFrameworkException.h"
 
 namespace OrthancDatabases
 {
--- a/Framework/Odbc/OdbcDatabase.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/Odbc/OdbcDatabase.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -31,7 +31,7 @@
 #include "OdbcResult.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 #include <Toolbox.h>
 
 #include <boost/algorithm/string/predicate.hpp>
--- a/Framework/Odbc/OdbcEnvironment.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/Odbc/OdbcEnvironment.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -24,7 +24,7 @@
 #include "OdbcEnvironment.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <boost/lexical_cast.hpp>
 #include <sqlext.h>
--- a/Framework/Odbc/OdbcPreparedStatement.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/Odbc/OdbcPreparedStatement.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -29,7 +29,7 @@
 #include "OdbcResult.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <cassert>
 #include <sqlext.h>
--- a/Framework/Odbc/OdbcResult.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/Odbc/OdbcResult.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -30,7 +30,7 @@
 
 #include <ChunkedBuffer.h>
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 #include <Toolbox.h>
 
 #include <boost/lexical_cast.hpp>
--- a/Framework/Odbc/OdbcStatement.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Framework/Odbc/OdbcStatement.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -27,7 +27,7 @@
 #include "OdbcEnvironment.h"
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../Common/OrthancFrameworkException.h"
 
 #include <sqlext.h>
 
--- a/MySQL/Plugins/MySQLIndex.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/MySQL/Plugins/MySQLIndex.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -32,7 +32,7 @@
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../../Framework/Common/OrthancFrameworkException.h"
 
 #include <ctype.h>
 
--- a/Odbc/Plugins/OdbcIndex.cpp	Tue Jun 02 13:09:40 2026 +0200
+++ b/Odbc/Plugins/OdbcIndex.cpp	Tue Jun 02 14:01:06 2026 +0200
@@ -30,7 +30,7 @@
 #include <EmbeddedResources.h>  // Autogenerated file
 
 #include <Logging.h>
-#include "OrthancFrameworkException.h"
+#include "../../Framework/Common/OrthancFrameworkException.h"
 #include <Toolbox.h>
 
 #include <boost/algorithm/string/replace.hpp>