[Boost-commit] svn:boost r52094 - in sandbox/guigl/boost/guigl: . platform

Subject: [Boost-commit] svn:boost r52094 - in sandbox/guigl/boost/guigl: . platform
From: stipe_at_[hidden]
Date: 2009-03-31 22:07:32

Author: srajko
Date: 2009-03-31 22:07:31 EDT (Tue, 31 Mar 2009)
New Revision: 52094
URL: http://svn.boost.org/trac/boost/changeset/52094

Log:
including windows.h before GL includes, addressing MSVC bug in assigning color_type
Text files modified: 
   sandbox/guigl/boost/guigl/platform/glu.hpp  |     4 ++++                                    
   sandbox/guigl/boost/guigl/platform/glut.hpp |     4 ++++                                    
   sandbox/guigl/boost/guigl/types.hpp         |     5 +++++                                   
   3 files changed, 13 insertions(+), 0 deletions(-)

Modified: sandbox/guigl/boost/guigl/platform/glu.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glu.hpp	(original)
+++ sandbox/guigl/boost/guigl/platform/glu.hpp	2009-03-31 22:07:31 EDT (Tue, 31 Mar 2009)
@@ -12,6 +12,10 @@
 
 #else
 
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#include "windows.h"
+#endif
+
 #include <GL/glu.h>
 
 #endif

Modified: sandbox/guigl/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glut.hpp	(original)
+++ sandbox/guigl/boost/guigl/platform/glut.hpp	2009-03-31 22:07:31 EDT (Tue, 31 Mar 2009)
@@ -12,6 +12,10 @@
 
 #else
 
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#include "windows.h"
+#endif
+
 #include <GL/glut.h>
 
 #endif

Modified: sandbox/guigl/boost/guigl/types.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/types.hpp	(original)
+++ sandbox/guigl/boost/guigl/types.hpp	2009-03-31 22:07:31 EDT (Tue, 31 Mar 2009)
@@ -28,6 +28,11 @@
     color_type(channel_t v0, channel_t v1, channel_t v2, channel_t v3 = static_cast<channel_t>(1))
         : base_type(v0,v1,v2,v3)
     {}
+    color_type &operator=(const color_type &rhs)
+    {
+        static_cast<base_type &>(*this) = static_cast<const base_type &>(rhs);
+        return *this;
+    }
 };
 
 }}