diff options
author | 2011-02-26 23:14:16 +0000 | |
---|---|---|
committer | 2011-02-26 23:14:16 +0000 | |
commit | 2c4c9b36faef13dd4ba408c80ca16461daee14bd (patch) | |
tree | 6456e55735ed7bb068428d76f6613c46dfc3487b | |
parent | 9338f116a900bb17271b947a528ba4c2e67cadde (diff) | |
download | paludis-2c4c9b36faef13dd4ba408c80ca16461daee14bd.tar.gz paludis-2c4c9b36faef13dd4ba408c80ca16461daee14bd.tar.xz |
Remove RepositoryMaskInfo
-rw-r--r-- | paludis/mask-fwd.hh | 4 | ||||
-rw-r--r-- | paludis/mask.hh | 18 | ||||
-rw-r--r-- | paludis/repositories/e/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/repositories/e/e_repository.cc | 10 | ||||
-rw-r--r-- | paludis/repositories/e/e_repository.hh | 3 | ||||
-rw-r--r-- | paludis/repositories/e/e_repository_mask_file.cc | 17 | ||||
-rw-r--r-- | paludis/repositories/e/e_repository_mask_file.hh | 5 | ||||
-rw-r--r-- | paludis/repositories/e/ebuild_id.cc | 12 | ||||
-rw-r--r-- | paludis/repositories/e/exheres_profile.cc | 10 | ||||
-rw-r--r-- | paludis/repositories/e/exheres_profile.hh | 2 | ||||
-rw-r--r-- | paludis/repositories/e/mask_info.cc | 24 | ||||
-rw-r--r-- | paludis/repositories/e/mask_info.hh | 46 | ||||
-rw-r--r-- | paludis/repositories/e/profile.hh | 5 | ||||
-rw-r--r-- | paludis/repositories/e/traditional_profile.cc | 10 | ||||
-rw-r--r-- | paludis/repositories/e/traditional_profile.hh | 2 | ||||
-rw-r--r-- | python/mask.cc | 44 |
16 files changed, 111 insertions, 103 deletions
diff --git a/paludis/mask-fwd.hh b/paludis/mask-fwd.hh index 569edc961..18353fd2c 100644 --- a/paludis/mask-fwd.hh +++ b/paludis/mask-fwd.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2011 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -38,8 +38,6 @@ namespace paludis class UnsupportedMask; class AssociationMask; - struct RepositoryMaskInfo; - struct OverriddenMask; #include <paludis/mask-se.hh> diff --git a/paludis/mask.hh b/paludis/mask.hh index ed4370820..9379512bd 100644 --- a/paludis/mask.hh +++ b/paludis/mask.hh @@ -53,24 +53,6 @@ namespace paludis } /** - * Information about a RepositoryMask. - * - * The mask_file key holds the file whence the mask originates. - * - * The comment key is a sequence of lines explaining the mask. - * - * \ingroup g_package_id - * \since 0.30 - * \nosubgrouping - */ - struct RepositoryMaskInfo - { - NamedValue<n::comment, std::shared_ptr<const Sequence<std::string> > > comment; - NamedValue<n::mask_file, FSPath> mask_file; - NamedValue<n::token, std::string> token; - }; - - /** * A Mask represents one reason why a PackageID is masked (not available to * be installed). * diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am index 942fa97dd..2854e413a 100644 --- a/paludis/repositories/e/Makefile.am +++ b/paludis/repositories/e/Makefile.am @@ -73,6 +73,7 @@ noinst_HEADERS = \ layout.hh \ make_use.hh \ manifest2_reader.hh \ + mask_info.hh \ memoised_hashes.hh \ metadata_xml.hh \ myoption.hh \ @@ -143,6 +144,7 @@ libpaludiserepository_la_SOURCES = \ layout.cc \ make_use.cc \ manifest2_reader.cc \ + mask_info.cc \ memoised_hashes.cc \ metadata_xml.cc \ myoption.cc \ diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index 5d5d3bb9b..acd9524ad 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -128,7 +128,7 @@ using namespace paludis; using namespace paludis::erepository; typedef std::unordered_map<QualifiedPackageName, - std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >, + std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >, Hash<QualifiedPackageName> > RepositoryMaskMap; typedef std::unordered_map<std::string, std::shared_ptr<MirrorsSequence> > MirrorMap; typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<const PackageDepSpec>, Hash<QualifiedPackageName> > VirtualsMap; @@ -615,7 +615,7 @@ ERepository::package_ids(const QualifiedPackageName & n) const return _imp->layout->package_ids(n); } -std::shared_ptr<const RepositoryMaskInfo> +std::shared_ptr<const MaskInfo> ERepository::repository_masked(const std::shared_ptr<const PackageID> & id) const { Lock l(_imp->mutexes->repo_mask_mutex); @@ -664,14 +664,14 @@ ERepository::repository_masked(const std::shared_ptr<const PackageID> & id) cons RepositoryMaskMap::iterator r(_imp->repo_mask.find(id->name())); if (_imp->repo_mask.end() == r) - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); else - for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator + for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >::const_iterator k(r->second.begin()), k_end(r->second.end()) ; k != k_end ; ++k) if (match_package(*_imp->params.environment(), *k->first, id, make_null_shared_ptr(), { })) return k->second; - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); } const std::shared_ptr<const Set<UnprefixedChoiceName> > diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh index 8bb7e0302..73d1dbf6c 100644 --- a/paludis/repositories/e/e_repository.hh +++ b/paludis/repositories/e/e_repository.hh @@ -28,6 +28,7 @@ #include <paludis/repositories/e/e_repository_id.hh> #include <paludis/repositories/e/profile.hh> #include <paludis/repositories/e/layout.hh> +#include <paludis/repositories/e/mask_info.hh> #include <memory> #include <string> @@ -162,7 +163,7 @@ namespace paludis const std::shared_ptr<const erepository::Layout> layout() const; const std::shared_ptr<const erepository::Profile> profile() const; - std::shared_ptr<const RepositoryMaskInfo> repository_masked(const std::shared_ptr<const PackageID> &) const; + std::shared_ptr<const erepository::MaskInfo> repository_masked(const std::shared_ptr<const PackageID> &) const; void regenerate_cache() const; diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc index aa20fe7bc..0da55ab8f 100644 --- a/paludis/repositories/e/e_repository_mask_file.cc +++ b/paludis/repositories/e/e_repository_mask_file.cc @@ -30,6 +30,7 @@ #include <paludis/util/sequence-impl.hh> #include <paludis/util/tokeniser.hh> #include <paludis/util/log.hh> +#include <paludis/util/join.hh> #include <paludis/mask.hh> #include <vector> @@ -38,7 +39,7 @@ using namespace paludis; using namespace paludis::erepository; -typedef std::list<std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > > MaskFileLines; +typedef std::list<std::pair<const std::string, std::shared_ptr<const erepository::MaskInfo> > > MaskFileLines; namespace paludis { @@ -108,12 +109,12 @@ MaskFile::MaskFile(const FSPath & f, const LineConfigFileOptions & opts, const E continue; } - _imp->lines.push_back(std::make_pair(tokens.at(0), std::shared_ptr<RepositoryMaskInfo>(std::make_shared<RepositoryMaskInfo>( - make_named_values<RepositoryMaskInfo>( - n::comment() = comment, - n::mask_file() = f, - n::token() = tokens.size() < 2 ? "" : tokens.at(1) - ))))); + _imp->lines.push_back(std::make_pair(tokens.at(0), std::make_shared<erepository::MaskInfo>( + make_named_values<erepository::MaskInfo>( + n::comment() = join(comment->begin(), comment->end(), " "), + n::mask_file() = f, + n::token() = tokens.size() < 2 ? "" : tokens.at(1) + )))); comment_used = true; } } @@ -135,5 +136,5 @@ MaskFile::~MaskFile() } template class WrappedForwardIterator<MaskFile::ConstIteratorTag, - const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > >; + const std::pair<const std::string, std::shared_ptr<const MaskInfo> > >; diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh index e74b0999d..ce64a224e 100644 --- a/paludis/repositories/e/e_repository_mask_file.hh +++ b/paludis/repositories/e/e_repository_mask_file.hh @@ -25,6 +25,7 @@ #include <paludis/util/config_file.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/mask-fwd.hh> +#include <paludis/repositories/e/mask_info.hh> namespace paludis { @@ -58,7 +59,7 @@ namespace paludis struct ConstIteratorTag; typedef WrappedForwardIterator<ConstIteratorTag, - const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > > ConstIterator; + const std::pair<const std::string, std::shared_ptr<const MaskInfo> > > ConstIterator; ConstIterator begin() const; ConstIterator end() const; @@ -67,7 +68,7 @@ namespace paludis } extern template class WrappedForwardIterator<erepository::MaskFile::ConstIteratorTag, - const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > >; + const std::pair<const std::string, std::shared_ptr<const erepository::MaskInfo> > >; } #endif diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc index 152db3556..8ce583892 100644 --- a/paludis/repositories/e/ebuild_id.cc +++ b/paludis/repositories/e/ebuild_id.cc @@ -567,14 +567,12 @@ EbuildID::need_masks_added() const /* repo unless user */ if (repo_mask) add_mask(std::make_shared<ERepositoryMask>('R', "repository", - repo_mask->comment() ? join(repo_mask->comment()->begin(), repo_mask->comment()->end(), " ") : "", - "", repo_mask->mask_file())); + repo_mask->comment(), "", repo_mask->mask_file())); /* profile unless user */ if (profile_mask) add_mask(std::make_shared<ERepositoryMask>('P', "profile", - profile_mask->comment() ? join(profile_mask->comment()->begin(), profile_mask->comment()->end(), " ") : "", - "", profile_mask->mask_file())); + profile_mask->comment(), "", profile_mask->mask_file())); /* user */ std::shared_ptr<const Mask> user_mask(_imp->environment->mask_for_user(shared_from_this(), false)); @@ -588,8 +586,7 @@ EbuildID::need_masks_added() const add_overridden_mask(std::make_shared<OverriddenMask>( make_named_values<OverriddenMask>( n::mask() = std::make_shared<ERepositoryMask>('r', "repository (overridden)", - repo_mask->comment() ? join(repo_mask->comment()->begin(), repo_mask->comment()->end(), " ") : "", - "", repo_mask->mask_file()), + repo_mask->comment(), "", repo_mask->mask_file()), n::override_reason() = mro_overridden_by_user ))); @@ -598,8 +595,7 @@ EbuildID::need_masks_added() const add_overridden_mask(std::make_shared<OverriddenMask>( make_named_values<OverriddenMask>( n::mask() = std::make_shared<ERepositoryMask>('p', "profile (overridden)", - profile_mask->comment() ? join(profile_mask->comment()->begin(), profile_mask->comment()->end(), " ") : "", - "", profile_mask->mask_file()), + profile_mask->comment(), "", profile_mask->mask_file()), n::override_reason() = mro_overridden_by_user ))); diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc index 07154dfd3..9ec0d772a 100644 --- a/paludis/repositories/e/exheres_profile.cc +++ b/paludis/repositories/e/exheres_profile.cc @@ -63,7 +63,7 @@ namespace typedef std::unordered_map<std::string, std::string, Hash<std::string> > EnvironmentVariablesMap; typedef std::unordered_map<QualifiedPackageName, - std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >, + std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >, Hash<QualifiedPackageName> > PackageMaskMap; } @@ -351,21 +351,21 @@ ExheresProfile::environment_variable(const std::string & s) const return i->second; } -const std::shared_ptr<const RepositoryMaskInfo> +const std::shared_ptr<const MaskInfo> ExheresProfile::profile_masked(const std::shared_ptr<const PackageID> & id) const { PackageMaskMap::const_iterator rr(_imp->package_mask.find(id->name())); if (_imp->package_mask.end() == rr) - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); else { - for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()), + for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >::const_iterator k(rr->second.begin()), k_end(rr->second.end()) ; k != k_end ; ++k) if (match_package(*_imp->env, *k->first, id, make_null_shared_ptr(), { })) return k->second; } - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); } const std::shared_ptr<const SetSpecTree> diff --git a/paludis/repositories/e/exheres_profile.hh b/paludis/repositories/e/exheres_profile.hh index 19277eee3..449b7cce1 100644 --- a/paludis/repositories/e/exheres_profile.hh +++ b/paludis/repositories/e/exheres_profile.hh @@ -91,7 +91,7 @@ namespace paludis virtual const std::string environment_variable(const std::string &) const; - virtual const std::shared_ptr<const RepositoryMaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const; + virtual const std::shared_ptr<const MaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const; virtual const std::shared_ptr<const SetSpecTree> system_packages() const; diff --git a/paludis/repositories/e/mask_info.cc b/paludis/repositories/e/mask_info.cc new file mode 100644 index 000000000..25f8eb21b --- /dev/null +++ b/paludis/repositories/e/mask_info.cc @@ -0,0 +1,24 @@ +/* vim: set sw=4 sts=4 et foldmethod=syntax : */ + +/* + * Copyright (c) 2011 Ciaran McCreesh + * + * This file is part of the Paludis package manager. Paludis is free software; + * you can redistribute it and/or modify it under the terms of the GNU General + * Public License version 2, as published by the Free Software Foundation. + * + * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <paludis/repositories/e/mask_info.hh> + +using namespace paludis; +using namespace paludis::erepository; + diff --git a/paludis/repositories/e/mask_info.hh b/paludis/repositories/e/mask_info.hh new file mode 100644 index 000000000..08cc8e5fb --- /dev/null +++ b/paludis/repositories/e/mask_info.hh @@ -0,0 +1,46 @@ +/* vim: set sw=4 sts=4 et foldmethod=syntax : */ + +/* + * Copyright (c) 2011 Ciaran McCreesh + * + * This file is part of the Paludis package manager. Paludis is free software; + * you can redistribute it and/or modify it under the terms of the GNU General + * Public License version 2, as published by the Free Software Foundation. + * + * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MASK_INFO_HH +#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MASK_INFO_HH 1 + +#include <paludis/util/named_value.hh> +#include <paludis/util/fs_path.hh> + +namespace paludis +{ + namespace n + { + typedef Name<struct name_comment> comment; + typedef Name<struct name_mask_file> mask_file; + typedef Name<struct name_token> token; + } + + namespace erepository + { + struct MaskInfo + { + NamedValue<n::comment, std::string> comment; + NamedValue<n::mask_file, FSPath> mask_file; + NamedValue<n::token, std::string> token; + }; + } +} + +#endif diff --git a/paludis/repositories/e/profile.hh b/paludis/repositories/e/profile.hh index 821c3f78a..83d0cd9e9 100644 --- a/paludis/repositories/e/profile.hh +++ b/paludis/repositories/e/profile.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -33,6 +33,7 @@ #include <paludis/util/map-fwd.hh> #include <paludis/util/singleton.hh> #include <paludis/repositories/e/e_repository_id.hh> +#include <paludis/repositories/e/mask_info.hh> #include <string> namespace paludis @@ -91,7 +92,7 @@ namespace paludis virtual const std::string environment_variable(const std::string &) const = 0; - virtual const std::shared_ptr<const RepositoryMaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const = 0; + virtual const std::shared_ptr<const MaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const = 0; virtual const std::shared_ptr<const SetSpecTree> system_packages() const = 0; diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc index 6255b1522..5b1eebbfd 100644 --- a/paludis/repositories/e/traditional_profile.cc +++ b/paludis/repositories/e/traditional_profile.cc @@ -71,7 +71,7 @@ namespace { typedef std::unordered_map<std::string, std::string, Hash<std::string> > EnvironmentVariablesMap; typedef std::unordered_map<QualifiedPackageName, - std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >, + std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >, Hash<QualifiedPackageName> > PackageMaskMap; typedef std::unordered_map<ChoiceNameWithPrefix, bool, Hash<ChoiceNameWithPrefix> > FlagStatusMap; @@ -1029,21 +1029,21 @@ TraditionalProfile::virtuals() const return _imp->virtuals; } -const std::shared_ptr<const RepositoryMaskInfo> +const std::shared_ptr<const MaskInfo> TraditionalProfile::profile_masked(const std::shared_ptr<const PackageID> & id) const { PackageMaskMap::const_iterator rr(_imp->package_mask.find(id->name())); if (_imp->package_mask.end() == rr) - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); else { - for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()), + for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const MaskInfo> > >::const_iterator k(rr->second.begin()), k_end(rr->second.end()) ; k != k_end ; ++k) if (match_package(*_imp->env, *k->first, id, make_null_shared_ptr(), { })) return k->second; } - return std::shared_ptr<const RepositoryMaskInfo>(); + return std::shared_ptr<const MaskInfo>(); } const std::shared_ptr<const Set<std::string> > diff --git a/paludis/repositories/e/traditional_profile.hh b/paludis/repositories/e/traditional_profile.hh index 3d4071734..e9bd53d1a 100644 --- a/paludis/repositories/e/traditional_profile.hh +++ b/paludis/repositories/e/traditional_profile.hh @@ -89,7 +89,7 @@ namespace paludis virtual const std::string environment_variable(const std::string &) const; - virtual const std::shared_ptr<const RepositoryMaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const; + virtual const std::shared_ptr<const MaskInfo> profile_masked(const std::shared_ptr<const PackageID> &) const; virtual const std::shared_ptr<const SetSpecTree> system_packages() const; diff --git a/python/mask.cc b/python/mask.cc index 1687b788c..ce48d4be1 100644 --- a/python/mask.cc +++ b/python/mask.cc @@ -28,19 +28,6 @@ using namespace paludis; using namespace paludis::python; namespace bp = boost::python; -namespace -{ - std::shared_ptr<RepositoryMaskInfo> make_repository_mask_info( - const std::shared_ptr<const Sequence<std::string> > & s, const FSPath & f, const std::string & t) - { - return std::make_shared<RepositoryMaskInfo>(make_named_values<RepositoryMaskInfo>( - n::comment() = s, - n::mask_file() = f, - n::token() = t - )); - } -} - class MaskSptrToPythonVisitor { private: @@ -320,37 +307,6 @@ struct AssociationMaskWrapper : void expose_mask() { /** - * RepositoryMaskInfo - */ - register_shared_ptrs_to_python<RepositoryMaskInfo>(rsp_const); - bp::class_<RepositoryMaskInfo, std::shared_ptr<RepositoryMaskInfo> > - ( - "RepositoryMaskInfo", - "Information about a RepositoryMask.", - bp::no_init - ) - - .def("__init__", - bp::make_constructor(&make_repository_mask_info), - "__init__(list of string, path_str, token_str)" - ) - - .add_property("mask_file", - &named_values_getter<RepositoryMaskInfo, n::mask_file, FSPath, &RepositoryMaskInfo::mask_file>, - &named_values_setter<RepositoryMaskInfo, n::mask_file, FSPath, &RepositoryMaskInfo::mask_file>, - "[ro] str\n" - "Holds the file whence the mask originates." - ) - - .add_property("comment", - &named_values_getter<RepositoryMaskInfo, n::comment, std::shared_ptr<const Sequence<std::string> >, &RepositoryMaskInfo::comment>, - &named_values_setter<RepositoryMaskInfo, n::comment, std::shared_ptr<const Sequence<std::string> >, &RepositoryMaskInfo::comment>, - "[ro] Iterable of str\n" - "Sequence of lines explaining the mask." - ) - ; - - /** * Mask */ MaskSptrToPython(); |