Rework exceptions

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

diff --git a/source/program.cpp b/source/program.cpp
index 3c3a78b7c298a15bb6e55f8b9e75268fd788c4c7..6fa1495387fb3280452b099dcc38dcb1ff561b38 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include "arb_shader_objects.h"
 #include "arb_vertex_shader.h"
-#include "except.h"
+#include "error.h"
 #include "extension.h"
 #include "program.h"
 #include "shader.h"
@@ -214,7 +214,7 @@ void Program::link()
        int value;
        glGetObjectParameterivARB(id, GL_OBJECT_LINK_STATUS_ARB, &value);
        if(!(linked = value))
-               throw CompileError(get_info_log());
+               throw compile_error(get_info_log());
 
        glGetObjectParameterivARB(id, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &value);
        for(int i=0; i<value; ++i)
@@ -244,7 +244,7 @@ string Program::get_info_log() const
 void Program::bind() const
 {
        if(!linked)
-               throw InvalidState("Program is not linked");
+               throw invalid_operation("Program::bind");
 
        if(!set_current(this))
                return;