# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1478690401 -3600
# Node ID 3cde3e806abea386c6811871e741b4ad6379d991
# Parent  d850500b8ca6f65a276e373d2dd656a0bf973c2c
sync

diff -r d850500b8ca6 -r 3cde3e806abe Orthanc/Core/Enumerations.cpp
--- a/Orthanc/Core/Enumerations.cpp	Tue Nov 08 10:15:05 2016 +0100
+++ b/Orthanc/Core/Enumerations.cpp	Wed Nov 09 12:20:01 2016 +0100
@@ -64,7 +64,7 @@
         return "Parameter out of range";
 
       case ErrorCode_NotEnoughMemory:
-        return "Not enough memory";
+        return "The server hosting Orthanc is running out of memory";
 
       case ErrorCode_BadParameterType:
         return "Bad type for a parameter";
@@ -156,6 +156,9 @@
       case ErrorCode_NotAcceptable:
         return "Cannot send a response which is acceptable according to the Accept HTTP header";
 
+      case ErrorCode_NullPointer:
+        return "Cannot handle a NULL pointer";
+
       case ErrorCode_SQLiteNotOpened:
         return "SQLite: The database is not opened";
 
diff -r d850500b8ca6 -r 3cde3e806abe Orthanc/Core/Enumerations.h
--- a/Orthanc/Core/Enumerations.h	Tue Nov 08 10:15:05 2016 +0100
+++ b/Orthanc/Core/Enumerations.h	Wed Nov 09 12:20:01 2016 +0100
@@ -52,7 +52,7 @@
     ErrorCode_Plugin = 1    /*!< Error encountered within the plugin engine */,
     ErrorCode_NotImplemented = 2    /*!< Not implemented yet */,
     ErrorCode_ParameterOutOfRange = 3    /*!< Parameter out of range */,
-    ErrorCode_NotEnoughMemory = 4    /*!< Not enough memory */,
+    ErrorCode_NotEnoughMemory = 4    /*!< The server hosting Orthanc is running out of memory */,
     ErrorCode_BadParameterType = 5    /*!< Bad type for a parameter */,
     ErrorCode_BadSequenceOfCalls = 6    /*!< Bad sequence of calls */,
     ErrorCode_InexistentItem = 7    /*!< Accessing an inexistent item */,
@@ -83,6 +83,7 @@
     ErrorCode_StorageAreaPlugin = 32    /*!< Error in the plugin implementing a custom storage area */,
     ErrorCode_EmptyRequest = 33    /*!< The request is empty */,
     ErrorCode_NotAcceptable = 34    /*!< Cannot send a response which is acceptable according to the Accept HTTP header */,
+    ErrorCode_NullPointer = 35    /*!< Cannot handle a NULL pointer */,
     ErrorCode_SQLiteNotOpened = 1000    /*!< SQLite: The database is not opened */,
     ErrorCode_SQLiteAlreadyOpened = 1001    /*!< SQLite: Connection is already open */,
     ErrorCode_SQLiteCannotOpen = 1002    /*!< SQLite: Unable to open the database */,
diff -r d850500b8ca6 -r 3cde3e806abe Orthanc/Core/Logging.h
--- a/Orthanc/Core/Logging.h	Tue Nov 08 10:15:05 2016 +0100
+++ b/Orthanc/Core/Logging.h	Wed Nov 09 12:20:01 2016 +0100
@@ -110,6 +110,12 @@
       {
         return (*stream_) << message;
       }
+
+      // This overload fixes build problems with Visual Studio 2015
+      std::ostream& operator<< (const char* message)
+      {
+        return (*stream_) << message;
+      }
     };
   }
 }