Fix compilation on 64-bit platforms

[libs/gl.git] / source / object.cpp

diff --git a/source/object.cpp b/source/object.cpp
index 2026e3d58f3d0b658ed4b3bdba7fe9d211d6ffd1..a23aa433b92a8a2611b938af84342c9fce082400 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -111,7 +111,7 @@ void Object::finish_render(const ObjectPass *pass) const
 void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
 {
        inst.setup_render(tag);
-       unsigned lod=min(inst.get_level_of_detail(), meshes.size()-1);
+       unsigned lod=min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
        meshes[lod]->draw();
        inst.finish_render(tag);
 }
@@ -169,7 +169,7 @@ void Object::Loader::shader_texture(const string &n)
        if(!obj.technique)
                throw InvalidState("Can't specify shader textures without a Technique");
 
-       unsigned eqsign=n.find('=');
+       string::size_type eqsign=n.find('=');
        if(eqsign==string::npos)
                throw InvalidParameterValue("Must specify texture slot name");