# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1776195068 -7200
# Node ID c4284995ffd4b83d2bfd2a08af6f198a54267d78
# Parent  53fa8373777bfda5277304aae3b0ee8bf8253386# Parent  c4fdaeaff98bd09af84f79b21e862ed741b84b14
merged 10.1 -> default

diff -r c4fdaeaff98b -r c4284995ffd4 Framework/Odbc/OdbcResult.cpp
--- a/Framework/Odbc/OdbcResult.cpp	Tue Apr 14 21:26:48 2026 +0200
+++ b/Framework/Odbc/OdbcResult.cpp	Tue Apr 14 21:31:08 2026 +0200
@@ -35,6 +35,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <sqlext.h>
+#include <cassert>
 
 
 namespace OrthancDatabases
diff -r c4fdaeaff98b -r c4284995ffd4 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Tue Apr 14 21:26:48 2026 +0200
+++ b/PostgreSQL/CMakeLists.txt	Tue Apr 14 21:31:08 2026 +0200
@@ -22,7 +22,7 @@
 cmake_minimum_required(VERSION 2.8...4.0)
 project(OrthancPostgreSQL)
 
-set(ORTHANC_PLUGIN_VERSION "10.1")
+set(ORTHANC_PLUGIN_VERSION "mainline")
 
 # This is the preferred version of the Orthanc SDK for this plugin
 set(ORTHANC_SDK_DEFAULT_VERSION "1.12.10")