From 98b4d6f697b100152f3aedf4be905af8e55444a7 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 18 Jun 2014 10:27:57 +0300 Subject: [PATCH] Allow the project to compile using Visual Studio 2013 --- libraries/audio/src/AudioRingBuffer.cpp | 1 + libraries/voxels/src/Tags.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index 9b50ed0bcb..2101fcb9cd 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -10,6 +10,7 @@ // #include +#include #include #include diff --git a/libraries/voxels/src/Tags.cpp b/libraries/voxels/src/Tags.cpp index d3c534735e..003e9ae80d 100644 --- a/libraries/voxels/src/Tags.cpp +++ b/libraries/voxels/src/Tags.cpp @@ -177,7 +177,9 @@ int retrieveData(std::string filename, std::stringstream &ss) { int type = file.peek(); if (type == 0x0A) { ss.flush(); - ss << file; + std::copy(std::istreambuf_iterator(file), + std::istreambuf_iterator(), + std::ostreambuf_iterator(ss)); return 0; }