From 784ac42a0f05608e3d9c5e15246dbf76ce9e3d51 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Tue, 1 Jul 2014 20:54:02 +0200 Subject: Removed unnecessary template member methods from TranformationFacade * neither the constructor nor the generate member methods need to be templatized ** only supported "output" argument is now a reference to a "std::basic_ostream" instance ** the caller is responsible for e.g. writing the output to disk * this was done to simplify the basic interface of InputXSLT * removed "default_params" testcase along with default parameter generation ** this feature is neither used nor required --- src/transformation_facade.h | 60 ++++++--------------------------------------- 1 file changed, 8 insertions(+), 52 deletions(-) (limited to 'src/transformation_facade.h') diff --git a/src/transformation_facade.h b/src/transformation_facade.h index eb134cd..ca57de4 100644 --- a/src/transformation_facade.h +++ b/src/transformation_facade.h @@ -5,6 +5,7 @@ #include #include +#include #include #include "common.h" @@ -26,9 +27,6 @@ class TransformationFacade { Arguments&&... ); - template - TransformationFacade(Arguments&&..., IncludeEntityResolver*); - TransformationFacade( xalan::XSLTInputSource, IncludeEntityResolver* @@ -40,14 +38,9 @@ class TransformationFacade { IncludeEntityResolver* ); - template - void generate(Target&); - - template - void generate(Target&, const StylesheetParameterGuard::map&); - - template - void generate(Target&, const xalan::XObjectPtr&); + void generate(std::basic_ostream&); + void generate(std::basic_ostream&, const StylesheetParameterGuard::map&); + void generate(std::basic_ostream&, const xalan::XObjectPtr&); WarningCapacitor::warning_cache_ptr getCachedWarnings(); @@ -59,9 +52,10 @@ class TransformationFacade { ErrorMultiplexer error_multiplexer_; WarningCapacitor warning_capacitor_; - void generate(const std::string&, StylesheetParameterGuard&); - void generate(std::basic_ostream&, StylesheetParameterGuard&); - void generate(xalan::XSLTResultTarget&&, StylesheetParameterGuard&); + void generate( + std::basic_ostream&, + StylesheetParameterGuard& + ); }; @@ -84,44 +78,6 @@ auto TransformationFacade::try_create( } } -template -TransformationFacade::TransformationFacade( - Arguments&&... arguments, - IncludeEntityResolver* resolver -): - TransformationFacade( - xalan::XSLTInputSource(std::forward(arguments))..., - resolver - ) { } - -template -void TransformationFacade::generate(Target& target) { - StylesheetParameterGuard guard(this->transformer_); - - this->generate(target, guard); -} - -template -void TransformationFacade::generate( - Target& target, - const StylesheetParameterGuard::map& parameters -) { - StylesheetParameterGuard guard(this->transformer_, parameters); - - this->generate(target, guard); -} - -template -void TransformationFacade::generate( - Target& target, - const xalan::XObjectPtr& parameter -) { - StylesheetParameterGuard guard(this->transformer_); - guard.set("parameters", parameter); - - this->generate(target, guard); -} - } #endif // INPUTXSLT_SRC_TRANSFORMATION_FACADE_H_ -- cgit v1.2.3