diff options
Diffstat (limited to 'src/components/rpc_base/include/rpc_base/rpc_base_inl.h')
| -rw-r--r-- | src/components/rpc_base/include/rpc_base/rpc_base_inl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h index a9ff484eb0..b6b47c2ed8 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VALIDATED_TYPES_INL_H_ -#define VALIDATED_TYPES_INL_H_ +#ifndef SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_INL_H_ +#define SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_INL_H_ #include "rpc_base.h" @@ -177,7 +177,7 @@ Integer<T, minval, maxval>& Integer<T, minval, maxval>::operator=( const Integer& new_val) { this->value_ = new_val.value_; if (new_val.is_initialized()) { - this->value_state_ = range_.Includes(new_val.value_) ? kValid : kInvalid; + this->value_state_ = new_val.value_state_; } return *this; @@ -547,12 +547,14 @@ void Nullable<T>::ReportErrors(ValidationReport* report) const { * Optional class */ template <typename T> -Optional<T>::Optional() {} +Optional<T>::Optional() + : policy_table_type_(policy_table_interface_base::INVALID_PT_TYPE) {} template <typename T> template <typename U> Optional<T>::Optional(const U& value) - : value_(value) {} + : policy_table_type_(policy_table_interface_base::INVALID_PT_TYPE) + , value_(value) {} template <typename T> T& Optional<T>::operator*() { @@ -672,4 +674,4 @@ void Stringifyable<T>::ReportErrors(ValidationReport* report) const { } // namespace rpc -#endif /* VALIDATED_TYPES_INL_H_ */ +#endif // SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_INL_H_ |