From bbc39ffe31c67506b4c03fc56fa3adcb925b6325 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
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/plugin.cxx | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'odb/plugin.cxx')

diff --git a/odb/plugin.cxx b/odb/plugin.cxx
index e32f225..51f0cb1 100644
--- a/odb/plugin.cxx
+++ b/odb/plugin.cxx
@@ -199,27 +199,23 @@ gate_callback (void*, void*)
     parser p (*options_, loc_pragmas_, ns_loc_pragmas_, decl_pragmas_);
     auto_ptr<unit> u (p.parse (global_namespace, file_));
 
-
     features f;
 
     // Validate, pass 1.
     //
-    validator v;
-    v.validate (*options_, f, *u, file_, 1);
+    validate (*options_, f, *u, file_, 1);
 
     // Process.
     //
-    processor pr;
-    pr.process (*options_, f, *u, file_);
+    process (*options_, f, *u, file_);
 
     // Validate, pass 2.
     //
-    v.validate (*options_, f, *u, file_, 2);
+    validate (*options_, f, *u, file_, 2);
 
     // Generate.
     //
-    generator g;
-    g.generate (*options_, f, *u, file_, inputs_);
+    generate (*options_, f, *u, file_, inputs_);
   }
   catch (cutl::re::format const& e)
   {
@@ -239,19 +235,19 @@ gate_callback (void*, void*)
     //
     r = 1;
   }
-  catch (validator::failed const&)
+  catch (validator_failed const&)
   {
     // Diagnostics has aready been issued.
     //
     r = 1;
   }
-  catch (processor::failed const&)
+  catch (processor_failed const&)
   {
     // Diagnostics has aready been issued.
     //
     r = 1;
   }
-  catch (generator::failed const&)
+  catch (generator_failed const&)
   {
     // Diagnostics has aready been issued.
     //
-- 
cgit v1.1