X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fsrc%2FOCRepresentation.cpp;h=06b208381595f256961f3ffbb5deb94b46a4b6d3;hb=a2593578edc02d063c1335a3e89b19a3b5a4b1ad;hp=68a14fc45fbd6b6e02054a53385acd00f69db80d;hpb=3cf359367887036001c70ff773d1774f4802098a;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp index 68a14fc..06b2083 100644 --- a/resource/src/OCRepresentation.cpp +++ b/resource/src/OCRepresentation.cpp @@ -315,11 +315,13 @@ namespace OC ((int64_t*)array)[pos] = item; } +#if !defined(_MSC_VER) template<> void get_payload_array::copy_to_array(std::_Bit_reference br, void* array, size_t pos) { ((bool*)array)[pos] = static_cast(br); } +#endif template<> void get_payload_array::copy_to_array(std::string item, void* array, size_t pos) @@ -903,13 +905,13 @@ namespace OC // contains the inner most vector-type typedef T base_type; // contains the AttributeType for this item - constexpr static AttributeType enum_type = + BOOST_STATIC_CONSTEXPR AttributeType enum_type = AttributeTypeConvert::type; // contains the AttributeType for this base-type - constexpr static AttributeType enum_base_type = + BOOST_STATIC_CONSTEXPR AttributeType enum_base_type = AttributeTypeConvert::type; // depth of the vector - constexpr static size_t depth = 0; + BOOST_STATIC_CONSTEXPR size_t depth = 0; }; template @@ -923,10 +925,10 @@ namespace OC { typedef T type; typedef typename type_info::base_type base_type; - constexpr static AttributeType enum_type = AttributeType::Vector; - constexpr static AttributeType enum_base_type = + BOOST_STATIC_CONSTEXPR AttributeType enum_type = AttributeType::Vector; + BOOST_STATIC_CONSTEXPR AttributeType enum_base_type = type_info::enum_base_type; - constexpr static size_t depth = 1 + + BOOST_STATIC_CONSTEXPR size_t depth = 1 + type_info::depth; }; @@ -936,9 +938,9 @@ namespace OC { typedef std::vector type; typedef std::vector base_type; - constexpr static AttributeType enum_type = AttributeType::Binary; - constexpr static AttributeType enum_base_type = AttributeType::Binary; - constexpr static size_t depth = 0; + BOOST_STATIC_CONSTEXPR AttributeType enum_type = AttributeType::Binary; + BOOST_STATIC_CONSTEXPR AttributeType enum_base_type = AttributeType::Binary; + BOOST_STATIC_CONSTEXPR size_t depth = 0; };