diff --git a/Foundation/include/Poco/TaskManager.h b/Foundation/include/Poco/TaskManager.h index f1b170c06..fc42d9ab1 100644 --- a/Foundation/include/Poco/TaskManager.h +++ b/Foundation/include/Poco/TaskManager.h @@ -121,9 +121,9 @@ public: static const int MIN_PROGRESS_NOTIFICATION_INTERVAL; protected: - void postNotification(Notification* pNf); - /// Posts a notification to the task manager's - /// notification center. + void postNotification(const Notification::Ptr& pNf); + /// Posts a notification to the task manager's + /// notification center. void taskStarted(Task* pTask); void taskProgress(Task* pTask, float progress); diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp index c5d68e4a3..48d6dd68a 100644 --- a/Foundation/src/NumberFormatter.cpp +++ b/Foundation/src/NumberFormatter.cpp @@ -43,7 +43,7 @@ #include -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) #define I64_FMT "I64" #elif defined(__APPLE__) #define I64_FMT "q" diff --git a/Foundation/src/NumberParser.cpp b/Foundation/src/NumberParser.cpp index 089f71ad7..9c6509dbc 100644 --- a/Foundation/src/NumberParser.cpp +++ b/Foundation/src/NumberParser.cpp @@ -46,11 +46,11 @@ #if defined(POCO_LONG_IS_64_BIT) - #define I64_FMT "l" -#elif defined(_MSC_VER) - #define I64_FMT "I64" + #define I64_FMT "l" +#elif defined(_MSC_VER) || defined(__MINGW32__) + #define I64_FMT "I64" #elif defined(__APPLE__) - #define I64_FMT "q" + #define I64_FMT "q" #else #define I64_FMT "ll" #endif diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp index 23fb53f66..57bd9d278 100644 --- a/Foundation/src/TaskManager.cpp +++ b/Foundation/src/TaskManager.cpp @@ -122,7 +122,7 @@ void TaskManager::removeObserver(const AbstractObserver& observer) } -void TaskManager::postNotification(Notification* pNf) +void TaskManager::postNotification(const Notification::Ptr& pNf) { _nc.postNotification(pNf); }