diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
| commit | f83677056891e436bf5ba99e79240df2a44528cd (patch) | |
| tree | 625bfd644b948e89105630759cf6decb0435354d /cpp/src/windows | |
| parent | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (diff) | |
| download | qpid-python-QPID-2519.tar.gz | |
Merged out from trunkQPID-2519
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/windows')
| -rw-r--r-- | cpp/src/windows/QpiddBroker.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/windows/resources/template-resource.rc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/windows/QpiddBroker.cpp b/cpp/src/windows/QpiddBroker.cpp index 884cdc366b..42ba97bdb1 100644 --- a/cpp/src/windows/QpiddBroker.cpp +++ b/cpp/src/windows/QpiddBroker.cpp @@ -147,7 +147,7 @@ NamedSharedMemory<T>::NamedSharedMemory(const std::string& n) : name(n), memory(NULL), data(0) -{}; +{} template <typename T> NamedSharedMemory<T>::~NamedSharedMemory() { @@ -155,7 +155,7 @@ NamedSharedMemory<T>::~NamedSharedMemory() { ::UnmapViewOfFile(data); if (memory != NULL) ::CloseHandle(memory); -}; +} template <typename T> T& NamedSharedMemory<T>::create() { diff --git a/cpp/src/windows/resources/template-resource.rc b/cpp/src/windows/resources/template-resource.rc index 725d1c9391..8ca0a90890 100644 --- a/cpp/src/windows/resources/template-resource.rc +++ b/cpp/src/windows/resources/template-resource.rc @@ -24,7 +24,7 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
|