[4088fd] [4088fd] Fixed namespace

src/lib/eval/Makefile.am

@@ -17,7 +17,7 @@ libkea_eval_la_SOURCES += token.cc token.h
 
 libkea_eval_la_SOURCES += parser.cc parser.h
 libkea_eval_la_SOURCES += lexer.cc
-libkea_eval_la_SOURCES += eval_context.cc
+libkea_eval_la_SOURCES += eval_context.cc eval_context.h eval_context_decl.h
 
 nodist_libkea_eval_la_SOURCES = eval_messages.h eval_messages.cc
 

src/lib/eval/eval_context.h

@@ -17,6 +17,7 @@
 #include <string>
 #include <map>
 #include <eval/parser.h>
+#include <eval/eval_context_decl.h>
 #include <exceptions/exceptions.h>
 
 // Tell Flex the lexer's prototype ...
@@ -25,6 +26,9 @@
 // ... and declare it for the parser's sake.
 YY_DECL;
 
+namespace isc {
+namespace eval {
+
 /// @brief Evaluation error exception raised when trying to parse an axceptions.
 class EvalError : public isc::Exception {
 public:
@@ -87,4 +91,8 @@ public:
     bool trace_parsing_;
   
 };
-#endif // ! EVALCONTEXT_H
+
+}; // end of isc::eval namespace
+}; // end of isc namespace
+
+#endif

src/lib/eval/lexer.ll

@@ -161,6 +161,8 @@ option\[{int}\] {
 <<EOF>>    return isc::eval::EvalParser::make_END(loc);
 %%
 
+using namespace isc::eval;
+
 void
 EvalContext::scanBegin()
 {

src/lib/eval/parser.yy

@@ -24,9 +24,10 @@
 {
 #include <string>
 #include <eval/token.h>
-class EvalContext;
+#include <eval/eval_context_decl.h>
 
 using namespace isc::dhcp;
+using namespace isc::eval;
 }
 // The parsing context.
 %param { EvalContext& ctx }