Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/Utils.cpp

Issue 10805001: Fixed: FileSystem;:Write should take an istream instance for input, not ostream (Closed)
Patch Set: Created May 24, 2013, 9:35 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/Utils.h ('k') | test/BaseJsTest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <sstream> 18 #include <sstream>
19 #include <string> 19 #include <stdexcept>
20 20
21 #include "Utils.h"
22 #ifdef _WIN32 21 #ifdef _WIN32
23 #include <Windows.h> 22 #include <Windows.h>
24 #include <Shlwapi.h> 23 #include <Shlwapi.h>
24 #endif
25 25
26 #include <stdexcept> 26 #include "Utils.h"
27
28 #endif
29 27
30 using namespace AdblockPlus; 28 using namespace AdblockPlus;
31 29
32 std::string Utils::Slurp(std::ios& stream) 30 std::string Utils::Slurp(std::istream& stream)
33 { 31 {
34 std::stringstream content; 32 std::stringstream content;
35 content << stream.rdbuf(); 33 content << stream.rdbuf();
36 return content.str(); 34 return content.str();
37 } 35 }
38 36
39 std::string Utils::FromV8String(v8::Handle<v8::Value> value) 37 std::string Utils::FromV8String(v8::Handle<v8::Value> value)
40 { 38 {
41 v8::String::Utf8Value stringValue(value); 39 v8::String::Utf8Value stringValue(value);
42 if (stringValue.length()) 40 if (stringValue.length())
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 if (FAILED(hr)) 96 if (FAILED(hr))
99 { 97 {
100 throw std::runtime_error("CanonizeUrl failed\n"); 98 throw std::runtime_error("CanonizeUrl failed\n");
101 } 99 }
102 } 100 }
103 return canonizedUrl; 101 return canonizedUrl;
104 102
105 } 103 }
106 #endif 104 #endif
107 105
OLDNEW
« no previous file with comments | « src/Utils.h ('k') | test/BaseJsTest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld