From 7ba9d86ffdfacfec4cc730e87612eba5cc32ecce Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 5 Sep 2017 10:04:41 -0700 Subject: [PATCH] Disambiguate some uses of PropertyType for msvc --- src/js_types.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js_types.hpp b/src/js_types.hpp index 40798cdb..4f20b6cf 100644 --- a/src/js_types.hpp +++ b/src/js_types.hpp @@ -355,6 +355,7 @@ inline bool Value::is_valid_for_property(ContextType context, const ValueType return true; } + using realm::PropertyType; if (realm::is_array(prop.type)) { if (prop.type != PropertyType::Object) { return false; @@ -396,8 +397,9 @@ inline bool Value::is_valid_for_property(ContextType context, const ValueType } } -inline std::string js_type_name_for_property_type(PropertyType type) +inline std::string js_type_name_for_property_type(realm::PropertyType type) { + using realm::PropertyType; if (realm::is_array(type)) { if (type == PropertyType::LinkingObjects) { throw std::runtime_error("LinkingObjects' type is not supported");