From 01968cb96ec759bfad19507823d22431e6bf80e4 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Fri, 29 Mar 2013 14:21:55 +0100
Subject: String: inherit from std::string rather than using it as a backend

---
 src/shell_manager.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/shell_manager.cc')

diff --git a/src/shell_manager.cc b/src/shell_manager.cc
index 31ff0b1b..dce3a13a 100644
--- a/src/shell_manager.cc
+++ b/src/shell_manager.cc
@@ -79,8 +79,8 @@ String ShellManager::pipe(const String& input,
         dup2(error_pipe[1], 2); close(error_pipe[1]);
         dup2(write_pipe[0], 0); close(write_pipe[0]);
 
-        boost::regex_iterator<String::iterator> it(cmdline.begin(), cmdline.end(), m_regex);
-        boost::regex_iterator<String::iterator> end;
+        boost::regex_iterator<String::const_iterator> it(cmdline.begin(), cmdline.end(), m_regex);
+        boost::regex_iterator<String::const_iterator> end;
 
         while (it != end)
         {
-- 
cgit v1.2.3