Merge remote branch 'edmondo/master'

2012-08-05 00:03:16 +02:00 · 2012-08-05 00:03:16 +02:00 · f5ee5a5414
commit f5ee5a5414
parent 1db7978361 20deb97a09
3 changed files with 4 additions and 0 deletions
--- a/apps/openmw/mwrender/terrainmaterial.cpp
+++ b/apps/openmw/mwrender/terrainmaterial.cpp
@ -2,6 +2,8 @@

 #include <OgreTerrain.h>

+#include <stdexcept>
+
 #include <extern/shiny/Main/Factory.hpp>

 namespace
--- a/components/esm/esm_reader.cpp
+++ b/components/esm/esm_reader.cpp
@ -1,4 +1,5 @@
 #include "esm_reader.hpp"
+#include <stdexcept>

 namespace ESM
 {
--- a/components/nif/nif_file.hpp
+++ b/components/nif/nif_file.hpp
@ -36,6 +36,7 @@
 #include <stdexcept>
 #include <vector>
 #include <cassert>
+#include <stdint.h>

 #include "record.hpp"
 #include "nif_types.hpp"