Merge branch 'develop'

Merge pull request #13 from danieljames/remove-random-shuffle-support-when-appropriate
Only support std::random_shuffle when available
2026-01-21 04:52:25 +00:00 · 2018-10-25 22:20:53 -04:00 · 2018-04-19 23:43:00 -04:00 · 2018-04-07 15:10:29 +01:00 · 2018-02-20 09:07:34 -05:00 · 2017-11-11 13:39:03 -05:00
2 changed files with 8 additions and 3 deletions
--- a/include/boost/lambda/algorithm.hpp
+++ b/include/boost/lambda/algorithm.hpp
@@ -684,6 +684,8 @@ struct rotate_copy {

 // random_shuffle  ---------------------------------

+#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
+
 struct random_shuffle {

  template <class Args>
@@ -703,6 +705,7 @@ struct random_shuffle {

 };

+#endif

 // partition  ---------------------------------

--- a/include/boost/lambda/core.hpp
+++ b/include/boost/lambda/core.hpp
@@ -22,6 +22,8 @@
 #ifndef BOOST_LAMBDA_CORE_HPP
 #define BOOST_LAMBDA_CORE_HPP

+#include "boost/config.hpp"
+
 #include "boost/type_traits/transform_traits.hpp"
 #include "boost/type_traits/cv_traits.hpp"

@@ -66,9 +68,9 @@ namespace {
  boost::lambda::placeholder2_type free2 = boost::lambda::placeholder2_type();
  boost::lambda::placeholder3_type free3 = boost::lambda::placeholder3_type();

-  boost::lambda::placeholder1_type& _1 = free1;
-  boost::lambda::placeholder2_type& _2 = free2;
-  boost::lambda::placeholder3_type& _3 = free3;
+  boost::lambda::placeholder1_type& BOOST_ATTRIBUTE_UNUSED _1 = free1;
+  boost::lambda::placeholder2_type& BOOST_ATTRIBUTE_UNUSED _2 = free2;
+  boost::lambda::placeholder3_type& BOOST_ATTRIBUTE_UNUSED _3 = free3;
  // _1, _2, ... naming scheme by Peter Dimov
 } // unnamed
Author	SHA1	Message	Date
Edward Diener	8824e81d52	Merge branch 'develop'	2018-10-25 22:20:53 -04:00
Edward Diener	6395013860	Merge pull request #13 from danieljames/remove-random-shuffle-support-when-appropriate Only support std::random_shuffle when available	2018-04-19 23:43:00 -04:00
Daniel James	8c0410fff5	Only support std::random_shuffle when available It was removed in C++17. We could emulate it when it isn't available, but that doesn't seem worth the effort.	2018-04-07 15:10:29 +01:00
Edward Diener	b8a2f400ac	Merge branch 'develop'	2018-02-20 09:07:34 -05:00
Edward Diener	4fc4454f3e	Merge pull request #12 from Kojoley/fix-unused-variable-warnings-from-core_hpp Fixed unused variable warnings from core.hpp	2017-11-11 13:39:03 -05:00
Nikita Kniazev	02999cca47	Fixed unused variable warnings from core.hpp	2017-11-10 15:48:28 +03:00