diff --git a/src/util/regex/regex-pseudo-matcher.hpp b/src/util/regex/regex-pseudo-matcher.hpp
index a8b3a2c..182402c 100644
--- a/src/util/regex/regex-pseudo-matcher.hpp
+++ b/src/util/regex/regex-pseudo-matcher.hpp
@@ -25,7 +25,8 @@
 public:
   RegexPseudoMatcher();
 
-  virtual ~RegexPseudoMatcher()
+  virtual
+  ~RegexPseudoMatcher()
   {
   }
 
@@ -41,15 +42,17 @@
   resetMatchResult();
 };
 
-inline RegexPseudoMatcher::RegexPseudoMatcher()
-  :RegexMatcher ("", EXPR_PSEUDO)
+inline
+RegexPseudoMatcher::RegexPseudoMatcher()
+  : RegexMatcher("", EXPR_PSEUDO)
 {
 }
 
 inline void
 RegexPseudoMatcher::setMatchResult(const std::string& str)
 {
-  m_matchResult.push_back(Name::Component((const uint8_t *)str.c_str(), str.size()));
+  m_matchResult.push_back(name::Component(reinterpret_cast<const uint8_t*>(str.c_str()),
+                                          str.size()));
 }
 
 inline void