Kleine Änderungen

common/strutil.cpp

@@ -186,7 +186,7 @@ bool readFile(const char *pszFilePath, std::string &str)
 	if(bGood)
 	{
 		stm.seekg(0, std::ios::end);
-		str.reserve(stm.tellg());
+        str.reserve((size_t)stm.tellg());
 		stm.seekg(0, std::ios::beg);
 		str.assign((std::istreambuf_iterator<char>(stm)), std::istreambuf_iterator<char>());
 	}

remanent/dbpersist.cpp

@@ -90,8 +90,8 @@ int CDbPersist::RestoreValues(const CRemVarTable &map, CLogfile &rlf)
 
 	if(!Init(db))
 	{
-        TRACE("Error initializing Datalogger Database: %s!\n", m_lastError.c_str());
-        rlf.Error("Error initializing Datalogger Database: %s!\n", m_lastError.c_str());
+        TRACE("Failed to initialize Datalogger Database: %s!\nNo Database-persistant values restored!\n", m_lastError.c_str());
+        rlf.Error("Failed to initialize Datalogger Database: %s! No Database-persistant values restored!\n", m_lastError.c_str());
 		return -1;
 	}
 

rest/defines.h

@@ -7,11 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // defines.h - Declarations:
 
-#define _REST_USE_SSL				0
-#define _REST_LINEAR_GET			1
-
-/////////////////////////////////////////////////////////////////////////////
-
 #ifdef __cplusplus
 template <class T>
 inline static const T& __min(const T& a, const T& b)