diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-04-30 13:52:21 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-04-30 13:52:21 -0400 |
| commit | 67df296650a72b8769fac58787148080ec771805 (patch) | |
| tree | 121b2de24f67b7591b9e8ebda3bc9aa0c84ffbff /contrib | |
| parent | prompt to delete build directory on 'make clean' (diff) | |
| download | monero-67df296650a72b8769fac58787148080ec771805.tar.xz | |
various fixes to allow mac osx compilation
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/serialization/keyvalue_serialization_overloads.h | 4 | ||||
| -rw-r--r-- | contrib/epee/include/storages/portable_storage.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/epee/include/serialization/keyvalue_serialization_overloads.h b/contrib/epee/include/serialization/keyvalue_serialization_overloads.h index 54535a404..33486d9ec 100644 --- a/contrib/epee/include/serialization/keyvalue_serialization_overloads.h +++ b/contrib/epee/include/serialization/keyvalue_serialization_overloads.h @@ -281,7 +281,7 @@ namespace epee } }; template<class t_storage> - struct base_serializable_types: public boost::mpl::vector<uint64_t, uint32_t, uint16_t, uint8_t, int64_t, int32_t, int16_t, int8_t, double, bool, std::string, typename t_storage::meta_entry>::type + struct base_serializable_types: public boost::mpl::vector<uint64_t, uint32_t, uint16_t, uint8_t, int64_t, int32_t, int16_t, int8_t, double, bool, std::string, typename t_storage::meta_entry>::type {}; //------------------------------------------------------------------------------------------------------------------- template<bool> struct selector; @@ -365,4 +365,4 @@ namespace epee return kv_serialization_overloads_impl_is_base_serializable_types<boost::mpl::contains<base_serializable_types<t_storage>, typename std::remove_const<t_type>::type>::value>::kv_unserialize(d, stg, hparent_section, pname); } } -}
\ No newline at end of file +} diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h index c244dac19..21904da9e 100644 --- a/contrib/epee/include/storages/portable_storage.h +++ b/contrib/epee/include/storages/portable_storage.h @@ -210,7 +210,7 @@ namespace epee template<class t_value> bool portable_storage::get_value(const std::string& value_name, t_value& val, hsection hparent_section) { - BOOST_MPL_ASSERT(( boost::mpl::contains<storage_entry::types, t_value> )); + //BOOST_MPL_ASSERT(( boost::mpl::contains<storage_entry::types, t_value> )); //TRY_ENTRY(); if(!hparent_section) hparent_section = &m_root; storage_entry* pentry = find_storage_entry(value_name, hparent_section); |