# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1444751509 -7200
# Node ID 581937911d14114514e144f03dcdedd70e0ec885
# Parent  02708dbbe449855f3437770a07d9a68ac202b19f# Parent  16e247e407d9e28b3815150e9d690cd9dbf840ba
merge

diff -r 16e247e407d9 -r 581937911d14 Orthanc/Core/Enumerations.cpp
--- a/Orthanc/Core/Enumerations.cpp	Fri Oct 09 18:30:25 2015 +0200
+++ b/Orthanc/Core/Enumerations.cpp	Tue Oct 13 17:51:49 2015 +0200
@@ -44,11 +44,6 @@
   // "Resources/GenerateErrorCodes.py"
   const char* EnumerationToString(ErrorCode error)
   {
-    if (error >= ErrorCode_START_PLUGINS)
-    {
-      return "Error encountered within some plugin";
-    }
-
     switch (error)
     {
       case ErrorCode_InternalError:
@@ -318,8 +313,21 @@
       case ErrorCode_DatabaseNotInitialized:
         return "Plugin trying to call the database during its initialization";
 
+      case ErrorCode_SslDisabled:
+        return "Orthanc has been built without SSL support";
+
+      case ErrorCode_CannotOrderSlices:
+        return "Unable to order the slices of the series";
+
       default:
-        return "Unknown error code";
+        if (error >= ErrorCode_START_PLUGINS)
+        {
+          return "Error encountered within some plugin";
+        }
+        else
+        {
+          return "Unknown error code";
+        }
     }
   }
 
diff -r 16e247e407d9 -r 581937911d14 Orthanc/Core/Enumerations.h
--- a/Orthanc/Core/Enumerations.h	Fri Oct 09 18:30:25 2015 +0200
+++ b/Orthanc/Core/Enumerations.h	Tue Oct 13 17:51:49 2015 +0200
@@ -134,6 +134,8 @@
     ErrorCode_StorageAreaAlreadyRegistered = 2036    /*!< Another plugin has already registered a custom storage area */,
     ErrorCode_DatabaseBackendAlreadyRegistered = 2037    /*!< Another plugin has already registered a custom database back-end */,
     ErrorCode_DatabaseNotInitialized = 2038    /*!< Plugin trying to call the database during its initialization */,
+    ErrorCode_SslDisabled = 2039    /*!< Orthanc has been built without SSL support */,
+    ErrorCode_CannotOrderSlices = 2040    /*!< Unable to order the slices of the series */,
     ErrorCode_START_PLUGINS = 1000000
   };
 
diff -r 16e247e407d9 -r 581937911d14 Orthanc/Core/SQLite/Connection.h
--- a/Orthanc/Core/SQLite/Connection.h	Fri Oct 09 18:30:25 2015 +0200
+++ b/Orthanc/Core/SQLite/Connection.h	Tue Oct 13 17:51:49 2015 +0200
@@ -46,7 +46,7 @@
 struct sqlite3;
 struct sqlite3_stmt;
 
-#define SQLITE_FROM_HERE SQLite::StatementId(__FILE__, __LINE__)
+#define SQLITE_FROM_HERE ::Orthanc::SQLite::StatementId(__FILE__, __LINE__)
 
 namespace Orthanc
 {
diff -r 16e247e407d9 -r 581937911d14 Resources/SyncOrthancFolder.py