Auto update

This commit is contained in:
Jenkins for Fcitx 5 Android 2022-08-28 05:27:40 +00:00
parent d7d02e975a
commit fb56950391
2204 changed files with 75279 additions and 29725 deletions

View file

@ -24,13 +24,16 @@
#include <boost/any.hpp>
#include <boost/function/function3.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <typeinfo>
#include <boost/mpl/bool.hpp>
#include <stdexcept>
#include <sstream>
#include <map>
#include <boost/type.hpp>
#include <boost/type_index.hpp>
#include <boost/smart_ptr.hpp>
#include <exception>
#include <map>
#include <sstream>
#include <stdexcept>
#include <string>
#include <typeinfo>
namespace boost {
@ -70,17 +73,17 @@ public:
//////////////////////////////////////////////////////////////////////
struct dynamic_property_exception : public std::exception {
virtual ~dynamic_property_exception() throw() {}
virtual const char* what() const throw() = 0;
~dynamic_property_exception() throw() BOOST_OVERRIDE {}
const char* what() const throw() BOOST_OVERRIDE = 0;
};
struct property_not_found : public dynamic_property_exception {
std::string property;
mutable std::string statement;
property_not_found(const std::string& property) : property(property) {}
virtual ~property_not_found() throw() {}
~property_not_found() throw() BOOST_OVERRIDE {}
const char* what() const throw() {
const char* what() const throw() BOOST_OVERRIDE {
if(statement.empty())
statement =
std::string("Property not found: ") + property + ".";
@ -93,13 +96,13 @@ struct dynamic_get_failure : public dynamic_property_exception {
std::string property;
mutable std::string statement;
dynamic_get_failure(const std::string& property) : property(property) {}
virtual ~dynamic_get_failure() throw() {}
~dynamic_get_failure() throw() BOOST_OVERRIDE {}
const char* what() const throw() {
const char* what() const throw() BOOST_OVERRIDE {
if(statement.empty())
statement =
std::string(
"dynamic property get cannot retrieve value for property: ")
"dynamic property get cannot retrieve value for property: ")
+ property + ".";
return statement.c_str();
@ -107,9 +110,9 @@ struct dynamic_get_failure : public dynamic_property_exception {
};
struct dynamic_const_put_error : public dynamic_property_exception {
virtual ~dynamic_const_put_error() throw() {}
~dynamic_const_put_error() throw() BOOST_OVERRIDE {}
const char* what() const throw() {
const char* what() const throw() BOOST_OVERRIDE {
return "Attempt to put a value into a const property map: ";
}
};
@ -147,7 +150,7 @@ class dynamic_property_map_adaptor : public dynamic_property_map
using boost::put;
key_type key_ = any_cast<key_type>(in_key);
if (in_value.type() == typeid(value_type)) {
if (in_value.type() == boost::typeindex::type_id<value_type>()) {
put(property_map_, key_, any_cast<value_type>(in_value));
} else {
// if in_value is an empty string, put a default constructed value_type.
@ -169,27 +172,27 @@ public:
explicit dynamic_property_map_adaptor(const PropertyMap& property_map_)
: property_map_(property_map_) { }
virtual boost::any get(const any& key_)
boost::any get(const any& key_) BOOST_OVERRIDE
{
return get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key_));
}
virtual std::string get_string(const any& key_)
std::string get_string(const any& key_) BOOST_OVERRIDE
{
std::ostringstream out;
out << get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key_));
return out.str();
}
virtual void put(const any& in_key, const any& in_value)
void put(const any& in_key, const any& in_value) BOOST_OVERRIDE
{
do_put(in_key, in_value,
mpl::bool_<(is_convertible<category*,
writable_property_map_tag*>::value)>());
}
virtual const std::type_info& key() const { return typeid(key_type); }
virtual const std::type_info& value() const { return typeid(value_type); }
const std::type_info& key() const BOOST_OVERRIDE { return typeid(key_type); }
const std::type_info& value() const BOOST_OVERRIDE { return typeid(value_type); }
PropertyMap& base() { return property_map_; }
const PropertyMap& base() const { return property_map_; }

View file

@ -11,7 +11,6 @@
#include <boost/property_map/parallel/distributed_property_map.hpp>
#include <boost/property_map/parallel/detail/untracked_pair.hpp>
#include <boost/type_traits/is_base_and_derived.hpp>
#include <boost/bind.hpp>
#include <boost/property_map/parallel/simple_trigger.hpp>
namespace boost { namespace parallel {

View file

@ -226,6 +226,6 @@ public:
}
#include <boost/property_map/vector_property_map.hpp>
#include <boost/property_map/parallel/vector_property_map.hpp>
#endif /* BOOST_PROPERTY_MAP_PARALLEL_PROPERTY_MAPS_HPP */

View file

@ -595,14 +595,6 @@ namespace boost {
} // namespace boost
#ifdef BOOST_GRAPH_USE_MPI
// Hide include from dependency trackers; the right fix
// is not to have it at all, but who knows what'll break
#define BOOST_PMAP_HEADER_NAME <boost/property_map/parallel/parallel_property_maps.hpp>
#include BOOST_PMAP_HEADER_NAME
#undef BOOST_PMAP_HEADER_NAME
#endif
#include <boost/property_map/vector_property_map.hpp>
#endif /* BOOST_PROPERTY_MAP_HPP */

View file

@ -93,12 +93,4 @@ namespace boost {
}
}
#ifdef BOOST_GRAPH_USE_MPI
// Hide include from dependency trackers; the right fix
// is not to have it at all, but who knows what'll break
#define BOOST_VPMAP_HEADER_NAME <boost/property_map/parallel/vector_property_map.hpp>
#include BOOST_VPMAP_HEADER_NAME
#undef BOOST_VPMAP_HEADER_NAME
#endif
#endif