From d90b3092ac57efa9fb900c3376e018595608d571 Mon Sep 17 00:00:00 2001
From: Willy Scheibel <willy.scheibel@hpi.de>
Date: Sat, 16 May 2020 13:38:37 +0200
Subject: [PATCH] Fix compilation

---
 source/globjects/include/globjects/glbindinglogging.h |  1 -
 source/globjects/source/Sync.cpp                      |  4 ++--
 source/globjects/source/glbindinglogging.cpp          | 11 -----------
 .../BufferImplementation_DirectStateAccessARB.cpp     |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/source/globjects/include/globjects/glbindinglogging.h b/source/globjects/include/globjects/glbindinglogging.h
index 7aa245a8..83fe38e3 100644
--- a/source/globjects/include/globjects/glbindinglogging.h
+++ b/source/globjects/include/globjects/glbindinglogging.h
@@ -46,7 +46,6 @@ GLOBJECTS_API LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::
 GLOBJECTS_API LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::VertexHintsMaskPGI & value);
 GLOBJECTS_API LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::PathFontStyle & value);
 GLOBJECTS_API LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::UnusedMask & value);
-GLOBJECTS_API LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::BufferAccessMask & value);
 
 
 } // namespace globjects
diff --git a/source/globjects/source/Sync.cpp b/source/globjects/source/Sync.cpp
index 648f5d4a..c5abe3d8 100644
--- a/source/globjects/source/Sync.cpp
+++ b/source/globjects/source/Sync.cpp
@@ -51,7 +51,7 @@ Sync::~Sync()
 
 GLsync Sync::fenceSync(const GLenum condition, const UnusedMask flags)
 {
-    return glFenceSync(condition, flags);
+    return glFenceSync(condition, static_cast<gl::GLbitfield>(flags));
 }
 
 GLsync Sync::sync() const
@@ -71,7 +71,7 @@ void Sync::wait(const GLuint64 timeout)
 
 void Sync::wait(const UnusedMask flags, const GLuint64 timeout)
 {
-    glWaitSync(m_sync, flags, timeout);
+    glWaitSync(m_sync, static_cast<gl::GLbitfield>(flags), timeout);
 }
 
 void Sync::get(const GLenum pname, const GLsizei bufsize, GLsizei * length, GLint * values)
diff --git a/source/globjects/source/glbindinglogging.cpp b/source/globjects/source/glbindinglogging.cpp
index 1d001ae8..385a3c90 100644
--- a/source/globjects/source/glbindinglogging.cpp
+++ b/source/globjects/source/glbindinglogging.cpp
@@ -251,16 +251,5 @@ LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::UnusedMask & v
     return builder;
 }
 
-LogMessageBuilder operator<<(LogMessageBuilder builder, const gl::BufferAccessMask & value)
-{
-    std::ostringstream stream;
-
-    stream << value;
-
-    builder << stream.str();
-
-    return builder;
-}
-
 
 } // namespace globjects
diff --git a/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp b/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp
index a164ef9f..666d76d8 100644
--- a/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp
+++ b/source/globjects/source/implementations/BufferImplementation_DirectStateAccessARB.cpp
@@ -36,7 +36,7 @@ void * BufferImplementation_DirectStateAccessARB::map(const Buffer * buffer, GLe
 
 void * BufferImplementation_DirectStateAccessARB::mapRange(const Buffer * buffer, GLintptr offset, GLsizeiptr length, MapBufferAccessMask access) const
 {
-    return glMapNamedBufferRange(buffer->id(), offset, static_cast<GLsizei>(length), static_cast<BufferAccessMask>(access));
+    return glMapNamedBufferRange(buffer->id(), offset, static_cast<GLsizei>(length), access);
 }
 
 bool BufferImplementation_DirectStateAccessARB::unmap(const Buffer * buffer) const