build: Warnings correction for gcc 4.2
Also in this commit some code style corrections.
Change-Id: Idf2b5b96b328fb3dbea7440362c84d7759a10ec5
Refs: #1429
diff --git a/src/util/regex/regex-backref-manager.hpp b/src/util/regex/regex-backref-manager.hpp
index bebaedb..f11e431 100644
--- a/src/util/regex/regex-backref-manager.hpp
+++ b/src/util/regex/regex-backref-manager.hpp
@@ -18,21 +18,21 @@
{
public:
RegexBackrefManager(){}
-
+
virtual ~RegexBackrefManager();
-
- int
+
+ int
pushRef(shared_ptr<RegexMatcher> matcher);
-
- void
+
+ void
popRef();
- int
+ size_t
size();
-
- shared_ptr<RegexMatcher>
+
+ shared_ptr<RegexMatcher>
getBackRef(int i);
-
+
private:
std::vector<shared_ptr<RegexMatcher> > m_backRefs;
};
@@ -43,10 +43,10 @@
m_backRefs.clear();
}
-inline int
+inline int
RegexBackrefManager::pushRef(shared_ptr<RegexMatcher> matcher)
{
- int last = m_backRefs.size();
+ size_t last = m_backRefs.size();
m_backRefs.push_back(matcher);
return last;
@@ -58,13 +58,13 @@
m_backRefs.pop_back();
}
-inline int
+inline size_t
RegexBackrefManager::size()
{
return m_backRefs.size();
}
-
-inline shared_ptr<RegexMatcher>
+
+inline shared_ptr<RegexMatcher>
RegexBackrefManager::getBackRef(int i)
{
return m_backRefs[i];