mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 19:49:41 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'corristo/master'

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/files/constrainedfiledatastream.cpp
View file

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

2
components/translation/translation.cpp
View file

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