1 files changed, 11 insertions, 8 deletions
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
index a2477142214..43bba90c291 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
@@ -25,8 +25,9 @@
 using std::cerr;
 using std::endl;
 
+using namespace CCF::CompilerElements;
 using namespace CCF::CIDL;
-using namespace SemanticGraph;
+using namespace CCF::CIDL::SemanticGraph;
 
 int
 main (int argc, char* argv[])
@@ -116,20 +117,18 @@ main (int argc, char* argv[])
       ? static_cast<std::istream&> (ifs)
       : static_cast<std::istream&> (std::cin);
 
-    CCF::InputStreamAdapter isa (is);
-    CCF::Preprocessor pp (isa);
+    InputStreamAdapter isa (is);
+    CPP::Preprocessor pp (isa);
 
     if (cl.get_value ("preprocess-only", false))
     {
       while (true)
       {
-        CCF::Preprocessor::int_type i = pp.next ();
+        CPP::Token t (pp.next ());
 
-        if (pp.eos (i)) break;
+        if (t == CPP::Token::eos) break;
 
-        CCF::Preprocessor::char_type c = pp.to_char_type (i);
-
-        std::cout << c;
+        std::cout << t;
       }
       return 0;
     }
@@ -217,6 +216,10 @@ main (int argc, char* argv[])
   {
     cerr << "invalid name exception" << endl;
   }
+  catch (std::exception const& e)
+  {
+    cerr << "caught standard exception " << e.what () << endl;
+  }
   catch (...)
   {
     cerr << "caught unknown exception" << endl;