Skip to content
Snippets Groups Projects
Commit 54ad634c authored by Amorilia's avatar Amorilia
Browse files

Make things compile under linux GCC.

parent e47e7d3d
No related branches found
No related tags found
No related merge requests found
......@@ -440,7 +440,7 @@ void NifStream( vector<T> const & val, ostream& file, uint version = 0 ) {
template <class T>
void NifStream( vector<Key<T> > & val, istream& file, uint version, uint attr_arg ) {
vector<Key<T> >::iterator it;
typename vector<Key<T> >::iterator it;
for ( it = val.begin(); it != val.end(); ++it ) {
NifStream( *it, file, version, attr_arg );
}
......@@ -448,7 +448,7 @@ void NifStream( vector<Key<T> > & val, istream& file, uint version, uint attr_ar
template <class T>
void NifStream( vector<Key<T> > const & val, ostream& file, uint version, uint attr_arg ) {
vector<Key<T> >::const_iterator it;
typename vector<Key<T> >::const_iterator it;
for ( it = val.begin(); it != val.end(); ++it ) {
NifStream( *it, file, version, attr_arg );
}
......
......@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. */
#include <cmath>
#include <iostream>
#include <stdexcept>
using namespace std;
......
......@@ -814,7 +814,7 @@ void MergeSceneGraph( map<string,NiAVObjectRef> & name_map, const NiAVObjectRef
//par_par->GetAttr("Children")->RemoveLinks( par );
//Get the block to attatch to
NiObjectRef attatch = name_map[par_par->name];
NiObjectRef attatch = DynamicCast<NiObject>(name_map[par_par->name]);
//TODO: Implement children
////Add this block as new child
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment