| Index: src/Utils.h |
| =================================================================== |
| --- a/src/Utils.h |
| +++ b/src/Utils.h |
| @@ -13,26 +13,28 @@ |
| * |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #ifndef ADBLOCK_PLUS_UTILS_H |
| #define ADBLOCK_PLUS_UTILS_H |
| -#include <v8.h> |
| #include <algorithm> |
| #include <cctype> |
| #include <functional> |
| +#include <istream> |
| +#include <string> |
| +#include <v8.h> |
| namespace AdblockPlus |
| { |
| namespace Utils |
| { |
| - std::string Slurp(std::ios& stream); |
| + std::string Slurp(std::istream& stream); |
| std::string FromV8String(v8::Handle<v8::Value> value); |
| v8::Local<v8::String> ToV8String(const std::string& str); |
| // Code for templated function has to be in a header file, can't be in .cpp |
| template <class T> |
| T TrimString(T text) |
| { |
| // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring |