diff options
Diffstat (limited to 'src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h')
| -rw-r--r-- | src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h index b9fcac4b6a..6c8bb359af 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VALIDATED_TYPES_JSON_INL_H_ -#define VALIDATED_TYPES_JSON_INL_H_ +#ifndef SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_JSON_INL_H_ +#define SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_JSON_INL_H_ #include "rpc_base/rpc_base.h" #include "json/value.h" @@ -140,8 +140,7 @@ Integer<T, minval, maxval>::Integer(const Json::Value* value) template <typename T, T minval, T maxval> Integer<T, minval, maxval>::Integer(const Integer& val) - : PrimitiveType(range_.Includes(val.value_) ? kValid : kInvalid) - , value_(val.value_) {} + : PrimitiveType(val.value_state_), value_(val.value_) {} template <typename T, T minval, T maxval> Integer<T, minval, maxval>::Integer(const Json::Value* value, IntType def_value) @@ -351,7 +350,8 @@ inline Json::Value Nullable<T>::ToJsonValue() const { template <typename T> template <typename U> Optional<T>::Optional(const Json::Value* value, const U& def_value) - : value_(value, def_value) {} + : policy_table_type_(policy_table_interface_base::INVALID_PT_TYPE) + , value_(value, def_value) {} template <typename T> inline Json::Value Optional<T>::ToJsonValue() const { @@ -384,4 +384,4 @@ inline Json::Value Stringifyable<T>::ToJsonValue() const { } // namespace rpc -#endif /* VALIDATED_TYPES_JSON_INL_H_ */ +#endif // SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_JSON_INL_H_ |