Skip to content

Commit 435a1cf

Browse files
committed
Fix missing typename/template error with Clang
1 parent 310278b commit 435a1cf

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

cppwamp/include/cppwamp/internal/options.ipp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ Variant Options<D>::optionByKey(const String& key) const
5858
//------------------------------------------------------------------------------
5959
template <typename D>
6060
template <typename T>
61-
#ifdef CPPWAMP_FOR_DOXYGEN
62-
ValueTypeOf<T>
63-
#else
64-
Options<D>::ValueTypeOf<T>
65-
#endif
66-
Options<D>::optionOr(
61+
ValueTypeOf<T> Options<D>::optionOr(
6762
const String& key, /**< The key to search under. */
6863
T&& fallback /**< The fallback value to return if the key was
6964
not found. */

cppwamp/include/cppwamp/options.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#ifndef CPPWAMP_OPTIONS_HPP
99
#define CPPWAMP_OPTIONS_HPP
1010

11+
#include "traits.hpp"
1112
#include "variant.hpp"
1213
#include "./internal/passkey.hpp"
1314

@@ -26,10 +27,6 @@ template <typename TDerived>
2627
class Options
2728
{
2829
public:
29-
/** Metafunction used to obtain the plain value type of a parameter
30-
passed by universal reference. */
31-
template <typename T> using ValueTypeOf = typename std::decay<T>::type;
32-
3330
/** Adds an option. */
3431
TDerived& withOption(String key, Variant value);
3532

0 commit comments

Comments
 (0)