Mercurial > hg > vamp-build-and-test

diff DEPENDENCIES/generic/include/boost/log/sources/basic_logger.hpp @ 117:fdfd5e9f8a77 emscripten

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 18 May 2016 15:55:14 +0100
parents c530137014c0
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/log/sources/basic_logger.hpp	Fri Sep 04 10:46:42 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/log/sources/basic_logger.hpp	Wed May 18 15:55:14 2016 +0100
@@ -1,5 +1,5 @@
 /*
- *          Copyright Andrey Semashev 2007 - 2013.
+ *          Copyright Andrey Semashev 2007 - 2015.
  * Distributed under the Boost Software License, Version 1.0.
  *    (See accompanying file LICENSE_1_0.txt or copy at
  *          http://www.boost.org/LICENSE_1_0.txt)
@@ -100,7 +100,7 @@
     //! Lock requirement for the remove_all_attributes_unlocked method
     typedef boost::log::aux::exclusive_lock_guard< threading_model > remove_all_attributes_lock;
     //! Lock requirement for the get_attributes method
-    typedef boost::log::aux::shared_lock_guard< threading_model > get_attributes_lock;
+    typedef boost::log::aux::shared_lock_guard< const threading_model > get_attributes_lock;
     //! Lock requirement for the open_record_unlocked method
     typedef boost::log::aux::shared_lock_guard< threading_model > open_record_lock;
     //! Lock requirement for the set_attributes method
@@ -110,7 +110,7 @@
     typedef no_lock< threading_model > add_attribute_lock;
     typedef no_lock< threading_model > remove_attribute_lock;
     typedef no_lock< threading_model > remove_all_attributes_lock;
-    typedef no_lock< threading_model > get_attributes_lock;
+    typedef no_lock< const threading_model > get_attributes_lock;
     typedef no_lock< threading_model > open_record_lock;
     typedef no_lock< threading_model > set_attributes_lock;
 #endif