From 27cb05aec1a4e1bddee22be057b1a23bbbacf730 Mon Sep 17 00:00:00 2001 From: ilor <kailoran@gmail.com> Date: Tue, 12 Apr 2011 17:20:51 +0200 Subject: [PATCH] fix member visibility issue in tagactions operators (delete, select...) --- libwccl/ops/tagactions/delete.h | 18 +++++++++--------- libwccl/ops/tagactions/relabel.h | 18 +++++++++--------- libwccl/ops/tagactions/select.h | 18 +++++++++--------- libwccl/ops/tagactions/unify.h | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libwccl/ops/tagactions/delete.h b/libwccl/ops/tagactions/delete.h index 53c8e85..3403138 100644 --- a/libwccl/ops/tagactions/delete.h +++ b/libwccl/ops/tagactions/delete.h @@ -39,15 +39,6 @@ public: */ std::string to_string(const Corpus2::Tagset& tagset) const; -protected: - /** - * Writes string representation of the Action to - * an output stream. - * @returns Stream written to. - * @note May be incomplete and/or containt internal info. - */ - std::ostream& write_to(std::ostream& ostream) const; - /** * Executes the Action on given context: it deletes * all lexemes of the token at given position that meet @@ -59,6 +50,15 @@ protected: */ Bool execute(const ActionExecContext &context) const; +protected: + /** + * Writes string representation of the Action to + * an output stream. + * @returns Stream written to. + * @note May be incomplete and/or containt internal info. + */ + std::ostream& write_to(std::ostream& ostream) const; + private: const PosFunctionPtr pos_; const BoolFunctionPtr condition_; diff --git a/libwccl/ops/tagactions/relabel.h b/libwccl/ops/tagactions/relabel.h index 18d78f6..418c28b 100644 --- a/libwccl/ops/tagactions/relabel.h +++ b/libwccl/ops/tagactions/relabel.h @@ -43,15 +43,6 @@ public: */ std::string to_string(const Corpus2::Tagset& tagset) const; -protected: - /** - * Writes string representation of the Action to - * an output stream. - * @returns Stream written to. - * @note May be incomplete and/or containt internal info. - */ - std::ostream& write_to(std::ostream& ostream) const; - /** * Executes the Action on given context: for all lexemes * that meet given condition, change their part of speech @@ -61,6 +52,15 @@ protected: */ Bool execute(const ActionExecContext &context) const; +protected: + /** + * Writes string representation of the Action to + * an output stream. + * @returns Stream written to. + * @note May be incomplete and/or containt internal info. + */ + std::ostream& write_to(std::ostream& ostream) const; + private: const PosFunctionPtr pos_; const BoolFunctionPtr condition_; diff --git a/libwccl/ops/tagactions/select.h b/libwccl/ops/tagactions/select.h index b3fd95a..bd46714 100644 --- a/libwccl/ops/tagactions/select.h +++ b/libwccl/ops/tagactions/select.h @@ -39,15 +39,6 @@ public: */ std::string to_string(const Corpus2::Tagset& tagset) const; -protected: - /** - * Writes string representation of the Action to - * an output stream. - * @returns Stream written to. - * @note May be incomplete and/or containt internal info. - */ - std::ostream& write_to(std::ostream& ostream) const; - /** * Executes the Action on given context: it deletes * all lexemes of the token at given position that do not meet @@ -59,6 +50,15 @@ protected: */ Bool execute(const ActionExecContext &context) const; +protected: + /** + * Writes string representation of the Action to + * an output stream. + * @returns Stream written to. + * @note May be incomplete and/or containt internal info. + */ + std::ostream& write_to(std::ostream& ostream) const; + private: const PosFunctionPtr pos_; const BoolFunctionPtr condition_; diff --git a/libwccl/ops/tagactions/unify.h b/libwccl/ops/tagactions/unify.h index e0e1527..33fe56a 100644 --- a/libwccl/ops/tagactions/unify.h +++ b/libwccl/ops/tagactions/unify.h @@ -43,15 +43,6 @@ public: */ std::string to_string(const Corpus2::Tagset& tagset) const; -protected: - /** - * Writes string representation of the Action to - * an output stream. - * @returns Stream written to. - * @note May be incomplete and/or containt internal info. - */ - std::ostream& write_to(std::ostream& ostream) const; - /** * Executes the Action on given context: remove lexemes * from tokens at given range that do not meet an agreement. @@ -61,6 +52,15 @@ protected: */ Bool execute(const ActionExecContext &context) const; +protected: + /** + * Writes string representation of the Action to + * an output stream. + * @returns Stream written to. + * @note May be incomplete and/or containt internal info. + */ + std::ostream& write_to(std::ostream& ostream) const; + private: const PosFunctionPtr pos_begin_; const PosFunctionPtr pos_end_; -- GitLab