summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Queue.h4
-rw-r--r--cpp/src/tests/CMakeLists.txt4
2 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index f1a2afe3a4..777ef5e35a 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -203,11 +203,11 @@ namespace qpid {
* available it will be dispatched immediately, else it
* will be returned to the front of the queue.
*/
- void requeue(const QueuedMessage& msg);
+ QPID_BROKER_EXTERN void requeue(const QueuedMessage& msg);
/**
* Used during recovery to add stored messages back to the queue
*/
- void recover(boost::intrusive_ptr<Message>& msg);
+ QPID_BROKER_EXTERN void recover(boost::intrusive_ptr<Message>& msg);
QPID_BROKER_EXTERN void consume(Consumer::shared_ptr c,
bool exclusive = false);
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt
index c8c2fba8c6..34f5d35a9a 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/cpp/src/tests/CMakeLists.txt
@@ -44,8 +44,10 @@ endif (ENABLE_VALGRIND)
# (non dll-interface class used as base for dll-interface class).
# This is ok, so suppress the warning.
# Also, boost lengthy names trigger warning 4503, decorated name length exceeded
+# and using getenv() triggers insecure CRT warnings which we can silence in the
+# test environment.
if (MSVC)
- add_definitions( /wd4275 /wd4503 )
+ add_definitions( /wd4275 /wd4503 /D_CRT_SECURE_NO_WARNINGS)
endif (MSVC)
# Like this to work with cmake 2.4 on Unix