| Index: src/Utils.cpp |
| =================================================================== |
| --- a/src/Utils.cpp |
| +++ b/src/Utils.cpp |
| @@ -11,30 +11,28 @@ |
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| * GNU General Public License for more details. |
| * |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <sstream> |
| -#include <string> |
| +#include <stdexcept> |
| -#include "Utils.h" |
| #ifdef _WIN32 |
| #include <Windows.h> |
| #include <Shlwapi.h> |
| +#endif |
| -#include <stdexcept> |
| - |
| -#endif |
| +#include "Utils.h" |
| using namespace AdblockPlus; |
| -std::string Utils::Slurp(std::ios& stream) |
| +std::string Utils::Slurp(std::istream& stream) |
| { |
| std::stringstream content; |
| content << stream.rdbuf(); |
| return content.str(); |
| } |
| std::string Utils::FromV8String(v8::Handle<v8::Value> value) |
| { |