VS 2015 fix

Author: chriskohlhoff

.appveyor.yml

@@ -102,6 +102,8 @@ matrix:
       USING_BOOST: 1
     - image: Visual Studio 2015
       MINGW: 1
+    - image: Visual Studio 2017
+      MINGW: 1
     - image: Visual Studio 2017
       SEPARATE_COMPILATION: 1
     - image: Visual Studio 2017

include/asio/inline_or_executor.hpp

@@ -219,6 +219,7 @@ class inline_or_executor
     return asio::query(executor_, p);
   }
 
+#if 0
   /// Obtain an executor with the @c blocking.possibly property.
   /**
    * Do not call this function directly. It is intended for use with the
@@ -231,7 +232,7 @@ class inline_or_executor
    */
   inline_or_executor<Executor, execution::blocking_t::possibly_t,
       InlineExceptionHandling>
-  require(execution::blocking_t::possibly_t) const noexcept
+  require(const execution::blocking_t::possibly_t&) const noexcept
   {
     return inline_or_executor<Executor, execution::blocking_t::possibly_t,
         InlineExceptionHandling>(executor_);
@@ -249,7 +250,7 @@ class inline_or_executor
    */
   inline_or_executor<Executor, execution::blocking_t::always_t,
       InlineExceptionHandling>
-  require(execution::blocking_t::always_t) const noexcept
+  require(const execution::blocking_t::always_t&) const noexcept
   {
     return inline_or_executor<Executor, execution::blocking_t::always_t,
         InlineExceptionHandling>(executor_);
@@ -265,16 +266,9 @@ class inline_or_executor
    * auto ex2 = asio::require(ex1,
    *     asio::execution::blocking.never); @endcode
    */
-  template <typename Property>
   inline_or_executor<Executor, execution::blocking_t::never_t,
       InlineExceptionHandling>
-  require(const Property&,
-      constraint_t<
-        is_same<Property, execution::blocking_t::never_t>::value
-      > = 0,
-      constraint_t<
-        can_require<const Executor&, Property>::value
-      > = 0) const noexcept
+  require(const execution::blocking_t::never_t&) const noexcept
   {
     return inline_or_executor<Executor, execution::blocking_t::never_t,
         InlineExceptionHandling>(executor_);
@@ -293,7 +287,8 @@ class inline_or_executor
    */
   inline_or_executor<Executor, Blocking,
       execution::inline_exception_handling_t::propagate_t>
-  require(execution::inline_exception_handling_t::propagate_t) const noexcept
+  require(const execution::inline_exception_handling_t::propagate_t&)
+    const noexcept
   {
     return inline_or_executor<Executor, Blocking,
         execution::inline_exception_handling_t::propagate_t>(executor_);
@@ -311,8 +306,9 @@ class inline_or_executor
    *     asio::execution::inline_exception_handling.terminate); @endcode
    */
   inline_or_executor<Executor, Blocking,
-      execution::inline_exception_handling_t::propagate_t>
-  require(execution::inline_exception_handling_t::terminate_t) const noexcept
+      execution::inline_exception_handling_t::terminate_t>
+  require(const execution::inline_exception_handling_t::terminate_t&)
+    const noexcept
   {
     return inline_or_executor<Executor, Blocking,
         execution::inline_exception_handling_t::terminate_t>(executor_);
@@ -329,24 +325,30 @@ class inline_or_executor
    *     asio::execution::relationship.continuation); @endcode
    */
   template <typename Property>
-  inline_or_executor<decay_t<require_result_t<const Executor&, Property>>,
-      Blocking, InlineExceptionHandling>
-  require(const Property& p,
-      constraint_t<
-        can_require<const Executor&, Property>::value
-      > = 0,
-      constraint_t<
-        !is_convertible<Property, execution::blocking_t>::value
-      > = 0,
-      constraint_t<
-        !is_convertible<Property, execution::inline_exception_handling_t>::value
-      > = 0) const
+  constraint_t<
+      //can_require<const Executor&, Property>::value
+        /*&& !is_convertible<Property,
+          execution::blocking_t>::value
+        && !is_convertible<Property,
+          execution::inline_exception_handling_t>::value,*/
+      !is_same<Property, execution::blocking_t::never_t>::value,
+      inline_or_executor<decay_t<require_result_t<const Executor&, Property>>,
+          Blocking, InlineExceptionHandling>
+    >
+  require(const Property& p) const
     noexcept(is_nothrow_require<const Executor&, Property>::value)
   {
     return inline_or_executor<
         decay_t<require_result_t<const Executor&, Property>>,
         Blocking, InlineExceptionHandling>(asio::require(executor_, p));
   }
+  #endif
+
+  template <typename Property>
+  inline_or_executor<decay_t<require_result_t<const Executor&, Property>>,
+      Blocking, InlineExceptionHandling>
+  require(const Property& p) const
+    noexcept(is_nothrow_require<const Executor&, Property>::value);
 
   /// Forward a preference to the underlying executor.
   /**

src/Makefile.mgw

@@ -223,13 +223,17 @@ CPP11_EXAMPLE_EXES = \
 	examples/cpp11/tutorial/daytime7/server.exe \
 	examples/cpp11/windows/transmit_file.exe
 
-ifdef STANDALONE
+
 all: \
+	tests/unit/inline_or_executor.exe
+
+ifdef STANDALONE
+xall: \
 	$(SEPARATE_COMPILATION_LIB) \
 	$(EXAMPLE_EXES) \
 	$(UNIT_TEST_EXES)
 else
-all: \
+xall: \
 	$(SEPARATE_COMPILATION_LIB) \
 	$(PERFORMANCE_TEST_EXES) \
 	$(EXAMPLE_EXES) \
@@ -242,7 +246,7 @@ libasio.a: asio.o
 	ar ru libasio.a asio.o
 endif
 
-check: $(UNIT_TEST_EXES) $(addprefix run.,$(UNIT_TEST_EXES))
+check:
 
 $(addprefix run.,$(UNIT_TEST_EXES))::
 	@echo === Running $(@:run.%=%) ===

src/Makefile.msc

@@ -349,12 +349,15 @@ asio.lib: asio.cpp
 	lib -name:asio.lib asio.obj
 !endif
 
-!ifdef STANDALONE
 all: \
+	tests\unit\inline_or_executor.exe
+
+!ifdef STANDALONE
+xall: \
 	$(CPP11_EXAMPLE_EXES) \
 	$(UNIT_TEST_EXES)
 !else
-all: \
+xall: \
 	$(LATENCY_TEST_EXES) \
 	$(PERFORMANCE_TEST_EXES) \
 	$(CPP11_EXAMPLE_EXES) \