From c06db136bd07d006a21e3c043bef43a420150d65 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Tue, 1 Dec 2015 17:25:14 +0000
Subject: [PATCH] Added a few noexcepts to some GL functions

---
 modules/juce_opengl/juce_opengl.cpp                   | 6 +++---
 modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp | 4 ++--
 modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp
index 7cb0e18acd..c17adbf2a9 100644
--- a/modules/juce_opengl/juce_opengl.cpp
+++ b/modules/juce_opengl/juce_opengl.cpp
@@ -147,20 +147,20 @@ static void checkGLError (const char* file, const int line)
  #define JUCE_CHECK_OPENGL_ERROR ;
 #endif
 
-static void clearGLError()
+static void clearGLError() noexcept
 {
     while (glGetError() != GL_NO_ERROR) {}
 }
 
 struct OpenGLTargetSaver
 {
-    OpenGLTargetSaver (const OpenGLContext& c)
+    OpenGLTargetSaver (const OpenGLContext& c) noexcept
         : context (c), oldFramebuffer (OpenGLFrameBuffer::getCurrentFrameBufferTarget())
     {
         glGetIntegerv (GL_VIEWPORT, oldViewport);
     }
 
-    ~OpenGLTargetSaver()
+    ~OpenGLTargetSaver() noexcept
     {
         context.extensions.glBindFramebuffer (GL_FRAMEBUFFER, oldFramebuffer);
         glViewport (oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
diff --git a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp
index 4453b6caf2..fac5e31290 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp
@@ -274,12 +274,12 @@ bool OpenGLFrameBuffer::makeCurrentRenderingTarget()
     return true;
 }
 
-GLuint OpenGLFrameBuffer::getFrameBufferID() const
+GLuint OpenGLFrameBuffer::getFrameBufferID() const noexcept
 {
     return pimpl != nullptr ? pimpl->frameBufferID : 0;
 }
 
-GLuint OpenGLFrameBuffer::getCurrentFrameBufferTarget()
+GLuint OpenGLFrameBuffer::getCurrentFrameBufferTarget() noexcept
 {
     GLint fb;
     glGetIntegerv (GL_FRAMEBUFFER_BINDING, &fb);
diff --git a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
index e7775eaec2..4ffefcf6cf 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
@@ -95,10 +95,10 @@ public:
     void releaseAsRenderingTarget();
 
     /** Returns the ID of this framebuffer, or 0 if it isn't initialised. */
-    GLuint getFrameBufferID() const;
+    GLuint getFrameBufferID() const noexcept;
 
     /** Returns the current frame buffer ID for the current context. */
-    static GLuint getCurrentFrameBufferTarget();
+    static GLuint getCurrentFrameBufferTarget() noexcept;
 
     /** Clears the framebuffer with the specified colour. */
     void clear (Colour colour);