Merge remote-tracking branch 'corristo/master'

This commit is contained in:
Marc Zinnschlag 2013-01-06 18:40:30 +01:00
commit e31cd1c805
2 changed files with 5 additions and 1 deletions

View file

@ -3,7 +3,11 @@
#include <stdexcept>
#include <cassert>
#ifndef __clang__
#include <cstdint>
#else
#include <tr1/cstdint>
#endif
namespace {

View file

@ -30,7 +30,7 @@ namespace Translation
{
std::string path = dataFileCollections.getCollection (extension).getPath (fileName).string();
std::ifstream stream (path);
std::ifstream stream (path.c_str());
if (!stream.is_open())
throw std::runtime_error ("failed to open translation file: " + fileName);