commit 9c57818289aaddeb33ee871d6a89ad3caa3c743d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed May 14 17:28:28 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu May 15 23:49:41 2014 -0700
tree 8c188ba3b3bbb423a273228f94905d233687f96f
parent 258ec2bf9db653fe5890f3cf4cc7d3d51d5a953b

src: Making use of DEPRECATED macro and updating library code not to use deprecated methods

Change-Id: Ibe17977e7fcbb759a26dbe1cfa3d472598e49bcc

src/util/regex/regex-component-matcher.hpp

diff --git a/src/util/regex/regex-component-matcher.hpp b/src/util/regex/regex-component-matcher.hpp
index de0b6c9..fcc0ccc 100644
--- a/src/util/regex/regex-component-matcher.hpp
+++ b/src/util/regex/regex-component-matcher.hpp
@@ -99,7 +99,7 @@
   if (m_isExactMatch)
     {
       boost::smatch subResult;
-      std::string targetStr = name.get(offset).toEscapedString();
+      std::string targetStr = name.get(offset).toUri();
       if (boost::regex_match(targetStr, subResult, m_componentRegex))
         {
           for (size_t i = 1; i < m_componentRegex.mark_count(); i++)

src/util/regex/regex-top-matcher.cpp

diff --git a/src/util/regex/regex-top-matcher.cpp b/src/util/regex/regex-top-matcher.cpp
index 3c95959..43cd169 100644
--- a/src/util/regex/regex-top-matcher.cpp
+++ b/src/util/regex/regex-top-matcher.cpp
@@ -196,7 +196,7 @@
   for (Name::const_iterator it = name.begin(); it != name.end(); it++)
     {
       regexStr.append("<");
-      regexStr.append(convertSpecialChar(it->toEscapedString()));
+      regexStr.append(convertSpecialChar(it->toUri()));
       regexStr.append(">");
     }