# HG changeset patch
# User amazy
# Date 1562838555 -7200
# Node ID 9aaf40d504a237e3dd781b290106b6ee9db445f0
# Parent  a5e225eac0a9ab29256234c7de2953dd4ba89f5e# Parent  4c89b61605633a76d82f14fc6029d7adc24dae7a
merge

diff -r a5e225eac0a9 -r 9aaf40d504a2 Resources/Samples/CppHelpers/Logging/ILogger.h
--- a/Resources/Samples/CppHelpers/Logging/ILogger.h	Thu Jul 11 11:48:54 2019 +0200
+++ b/Resources/Samples/CppHelpers/Logging/ILogger.h	Thu Jul 11 11:49:15 2019 +0200
@@ -36,7 +36,11 @@
   // check LogContext class for more details
   class BaseLogger : public ILogger
   {
+#if defined(BOOST_ENABLE_THREADS)
     boost::thread_specific_ptr<std::vector<std::string>> contexts_;
+#else
+    std::auto_ptr<std::vector<std::string>> contexts_;
+#endif
     bool logContextChanges_;
 
   public: