Some more cleanup of includes and forward declarations

[libs/gl.git] / source / materials / technique.h

diff --git a/source/materials/technique.h b/source/materials/technique.h
index a7999c0cf67652a140a219c24258e2a3e210ee39..419c676570a653b41549b65b8467d1fa84a1ad58 100644 (file)
--- a/source/materials/technique.h
+++ b/source/materials/technique.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TECHNIQUE_H_
 #define MSP_GL_TECHNIQUE_H_
 
+#include <map>
 #include "renderpass.h"
 #include "tag.h"
 
@@ -49,22 +50,18 @@ private:
                void uniforms();
        };
 
-public:
-       typedef std::map<Tag, RenderPass> PassMap;
-
-private:
-       PassMap passes;
+       std::map<Tag, RenderPass> passes;
 
 public:
        RenderPass &add_pass(Tag);
        bool has_pass(Tag) const;
        const RenderPass &get_pass(Tag) const;
        const RenderPass *find_pass(Tag) const;
-       const PassMap &get_passes() const { return passes; }
+       const std::map<Tag, RenderPass> &get_passes() const { return passes; }
        bool replace_texture(const std::string &, const Texture &);
        bool replace_material(const std::string &, const Material &);
        bool replace_uniforms(const ProgramData &);
-       bool has_shaders() const;
+       DEPRECATED bool has_shaders() const;
 
        void set_debug_name(const std::string &);
 };