[4088fd] [4088fd] Fixed namespace

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index 0f204f181cf9d371844be430b477a1b7b195ee7e..f71647a4e1dd037e3317070d040a2d64c5fe3052 100644 (file)
--- a/src/lib/eval/Makefile.am
+++ b/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
 

diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h
index 2010bacfc9722785e2949425a733931b76243883..80ba4c76fea24bdc3fe6d77ce394c645531ec1b6 100644 (file)
--- a/src/lib/eval/eval_context.h
+++ b/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

diff --git a/src/lib/eval/lexer.ll b/src/lib/eval/lexer.ll
index 14b5de0d690772306f6affec07b147b3f0841f06..9300b2d3f45f975fda8fd042427f9b39d61c246d 100644 (file)
--- a/src/lib/eval/lexer.ll
+++ b/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()
 {

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index ba500124c8d3ac835d70d85c66345381bbefd909..f1b12044c0e44430b5b8fed40839a23d75b2d51a 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/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 }