Skip to content

Commit 3116bff

Browse files
committed
VS 2015 fix
1 parent 476d9cb commit 3116bff

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

include/asio/inline_or_executor.hpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,13 @@ class inline_or_executor
266266
* asio::execution::blocking.never); @endcode
267267
*/
268268
template <typename Property>
269-
inline_or_executor<Executor, execution::blocking_t::never_t,
270-
InlineExceptionHandling>
271-
require(const Property&,
272-
constraint_t<
273-
is_same<Property, execution::blocking_t::never_t>::value
274-
> = 0,
275-
constraint_t<
276-
can_require<const Executor&, Property>::value
277-
> = 0) const noexcept
269+
constraint_t<
270+
is_same<Property, execution::blocking_t::never_t>::value
271+
&& can_require<const Executor&, Property>::value,
272+
inline_or_executor<Executor, execution::blocking_t::never_t,
273+
InlineExceptionHandling>
274+
>
275+
require(const Property&) const noexcept
278276
{
279277
return inline_or_executor<Executor, execution::blocking_t::never_t,
280278
InlineExceptionHandling>(executor_);

src/Makefile.msc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,15 @@ asio.lib: asio.cpp
349349
lib -name:asio.lib asio.obj
350350
!endif
351351

352-
!ifdef STANDALONE
353352
all: \
353+
tests\unit\inline_or_executor.exe
354+
355+
!ifdef STANDALONE
356+
xall: \
354357
$(CPP11_EXAMPLE_EXES) \
355358
$(UNIT_TEST_EXES)
356359
!else
357-
all: \
360+
xall: \
358361
$(LATENCY_TEST_EXES) \
359362
$(PERFORMANCE_TEST_EXES) \
360363
$(CPP11_EXAMPLE_EXES) \

0 commit comments

Comments
 (0)