Skip to content

Commit 4910c25

Browse files
committed
Merge branch 'bg-prepare'
2 parents 9eb244d + 619c1bc commit 4910c25

File tree

1 file changed

+10
-2
lines changed
  • include/boost/geometry/geometries/concepts

1 file changed

+10
-2
lines changed

include/boost/geometry/geometries/concepts/check.hpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,11 @@ struct checker<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const>
219219
\ingroup concepts
220220
*/
221221
template <typename Geometry>
222-
constexpr inline void check()
222+
// workaround for VS2015
223+
#if !defined(_MSC_VER) || (_MSC_VER >= 1910)
224+
constexpr
225+
#endif
226+
inline void check()
223227
{
224228
detail::checker<Geometry> c;
225229
boost::ignore_unused(c);
@@ -232,7 +236,11 @@ constexpr inline void check()
232236
\ingroup concepts
233237
*/
234238
template <typename Geometry1, typename Geometry2>
235-
constexpr inline void check_concepts_and_equal_dimensions()
239+
// workaround for VS2015
240+
#if !defined(_MSC_VER) || (_MSC_VER >= 1910)
241+
constexpr
242+
#endif
243+
inline void check_concepts_and_equal_dimensions()
236244
{
237245
check<Geometry1>();
238246
check<Geometry2>();

0 commit comments

Comments
 (0)