From bbc39ffe31c67506b4c03fc56fa3adcb925b6325 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 3 Jun 2015 21:35:43 +0200 Subject: Remove gratuitous classes In the process also get rid of global class processor which conflicts with enum processor on MIPS. --- odb/relational/validator.cxx | 6 +++--- odb/relational/validator.hxx | 29 +++++++++-------------------- 2 files changed, 12 insertions(+), 23 deletions(-) (limited to 'odb/relational') diff --git a/odb/relational/validator.cxx b/odb/relational/validator.cxx index 1d51c9a..47f089c 100644 --- a/odb/relational/validator.cxx +++ b/odb/relational/validator.cxx @@ -528,7 +528,7 @@ namespace relational }; } - void validator:: + void validate (options const&, features&, semantics::unit& u, @@ -608,7 +608,7 @@ namespace relational } if (!valid) - throw failed (); + throw operation_failed (); if (pass == 1) { @@ -636,6 +636,6 @@ namespace relational } if (!valid) - throw failed (); + throw operation_failed (); } } diff --git a/odb/relational/validator.hxx b/odb/relational/validator.hxx index f0ede53..93360c3 100644 --- a/odb/relational/validator.hxx +++ b/odb/relational/validator.hxx @@ -11,26 +11,15 @@ namespace relational { - class validator - { - public: - struct failed {}; - - // The first pass is performed before processing. The second -- after. - // - void - validate (options const&, - features&, - semantics::unit&, - semantics::path const&, - unsigned short pass); - - validator () {} - - private: - validator (validator const&); - validator& operator= (validator const&); - }; + // The first pass is performed before processing. The second -- after. + // Throws operation_failed to signal a failure. + // + void + validate (options const&, + features&, + semantics::unit&, + semantics::path const&, + unsigned short pass); } #endif // ODB_RELATIONAL_VALIDATOR_HXX -- cgit v1.1