Permalink
Browse files

Update boost sources to version 1.50.0

Limit regal and opengl logging to input parameters.
Fixes for fixed-function emulation.
Compile-time and environment variable configuration for emulation.
Support parallel GNU make builds with -j option.
  • Loading branch information...
nigels-com committed Jul 4, 2012
1 parent 1df6ef2 commit 4bcf96e10a4a7c7c248948adf727c213b6dd0108
Showing with 11,374 additions and 8,187 deletions.
  1. +32 −26 .gitignore
  2. +13 −4 Makefile
  3. +8 −2 README.rst
  4. +2 −1 src/boost/boost/config/compiler/borland.hpp
  5. +15 −5 src/boost/boost/config/compiler/clang.hpp
  6. +2 −2 src/boost/boost/config/compiler/codegear.hpp
  7. +2 −1 src/boost/boost/config/compiler/common_edg.hpp
  8. +1 −0 src/boost/boost/config/compiler/cray.hpp
  9. +2 −1 src/boost/boost/config/compiler/digitalmars.hpp
  10. +5 −4 src/boost/boost/config/compiler/gcc.hpp
  11. +2 −1 src/boost/boost/config/compiler/gcc_xml.hpp
  12. +2 −1 src/boost/boost/config/compiler/hp_acc.hpp
  13. +3 −1 src/boost/boost/config/compiler/intel.hpp
  14. +2 −1 src/boost/boost/config/compiler/metrowerks.hpp
  15. +2 −1 src/boost/boost/config/compiler/mpw.hpp
  16. +17 −17 src/boost/boost/config/compiler/pathscale.hpp
  17. +46 −5 src/boost/boost/config/compiler/pgi.hpp
  18. +2 −1 src/boost/boost/config/compiler/sunpro_cc.hpp
  19. +2 −1 src/boost/boost/config/compiler/vacpp.hpp
  20. +54 −39 src/boost/boost/config/compiler/visualc.hpp
  21. +24 −20 src/boost/boost/config/stdlib/dinkumware.hpp
  22. +22 −18 src/boost/boost/config/stdlib/libcomo.hpp
  23. +5 −4 src/boost/boost/config/stdlib/libcpp.hpp
  24. +33 −22 src/boost/boost/config/stdlib/libstdcpp3.hpp
  25. +22 −18 src/boost/boost/config/stdlib/modena.hpp
  26. +22 −18 src/boost/boost/config/stdlib/msl.hpp
  27. +22 −18 src/boost/boost/config/stdlib/roguewave.hpp
  28. +22 −18 src/boost/boost/config/stdlib/sgi.hpp
  29. +22 −18 src/boost/boost/config/stdlib/stlport.hpp
  30. +22 −18 src/boost/boost/config/stdlib/vacpp.hpp
  31. +92 −11 src/boost/boost/config/suffix.hpp
  32. +2 −2 src/boost/boost/print/interface.hpp
  33. +505 −505 src/regal/Regal.cpp
  34. +44 −1 src/regal/RegalConfig.cpp
  35. +7 −0 src/regal/RegalConfig.h
  36. +67 −31 src/regal/RegalContext.cpp
  37. +9,752 −6,912 src/regal/RegalDispatchEmu.cpp
  38. +349 −349 src/regal/RegalDispatchLog.cpp
  39. +7 −6 src/regal/RegalEmu.h
  40. +5 −5 src/regal/RegalIff.cpp
  41. +46 −79 src/regal/RegalIff.h
  42. +68 −0 src/regal/RegalUtil.h
View
@@ -1,27 +1,33 @@
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
+lib
+tmp
bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
+depends
+built
+build
+xcuserdata
+project.xcworkspace
+.DS_Store
+*~
+*.o
+*.orig
+*.p4r
+*.pyc
+*.ncb
+*.suo
+*.vcproj.*
+*.vcxproj.*
+*.sdf
+*.swp
+j
+j0
+j1
+j2
+save
+Debug
+results.txt
+testing/*/*.exe
+testing/*/*.dll
+testing/*/*.so
+testing/*/*.so.1
+testing/*/*.dylib
+testing/*/gold
View
@@ -128,7 +128,7 @@ tmp/$(SYSTEM)/glew/shared/%.o: src/glew/src/%.c
@mkdir -p $(dir $@)
$(CC) $(CFLAGS) $(PICFLAG) $(GLEW.CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-lib/$(GLEW.SHARED): $(GLEW.OBJS)
+lib/$(GLEW.SHARED): $(GLEW.OBJS) lib/$(LIB.SHARED)
$(LD) $(LDFLAGS.DYNAMIC) -o $@ $^ $(LIB.LDFLAGS) $(GLEW.LIBS) -lpthread
ifneq ($(STRIP),)
$(STRIP) -x $@
@@ -213,7 +213,7 @@ tmp/$(SYSTEM)/glut/shared/%.o: src/glut/src/%.c
@mkdir -p $(dir $@)
$(CC) $(CFLAGS) $(PICFLAG) $(GLUT.CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-lib/$(GLUT.SHARED): $(GLUT.OBJS)
+lib/$(GLUT.SHARED): $(GLUT.OBJS) lib/$(LIB.SHARED)
$(LD) $(LDFLAGS.DYNAMIC) -o $@ $^ $(GLUT.LIBS)
ifneq ($(STRIP),)
$(STRIP) -x $@
@@ -249,7 +249,7 @@ tmp/$(SYSTEM)/dreamtorus/static/%.o: examples/dreamtorus/glut/code/%.cpp
@mkdir -p $(dir $@)
$(CC) $(CFLAGS) $(DREAMTORUS.CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-bin/dreamtorus: $(DREAMTORUS.OBJS)
+bin/dreamtorus: $(DREAMTORUS.OBJS) lib/$(LIB.SHARED)
$(LD) -o $@ $^ $(LIB.LDFLAGS) $(DREAMTORUS.LIBS)
ifneq ($(STRIP),)
$(STRIP) -x $@
@@ -273,12 +273,21 @@ tmp/$(SYSTEM)/tiger/static/%.o: examples/tiger/%.c
@mkdir -p $(dir $@)
$(CC) $(CFLAGS) $(TIGER.CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-bin/tiger: $(TIGER.OBJS)
+bin/tiger: $(TIGER.OBJS) lib/$(GLEW.SHARED) lib/$(LIB.SHARED)
$(LD) -o $@ $^ $(TIGER.LIBS)
ifneq ($(STRIP),)
$(STRIP) -x $@
endif
+#
+# GLUT dependency for non-Mac builds
+#
+
+ifeq ($(filter darwin%,$(SYSTEM)),)
+bin/tiger: lib/$(GLUT.SHARED)
+bin/dreamtorus: lib/$(GLUT.SHARED)
+endif
+
clean:
$(RM) -r tmp/
$(RM) -r lib/
View
@@ -65,9 +65,15 @@ Features
- Enabled by default.
- - Build-time configuration: **REGAL_NO_EMULATION**
+ - Build-time configuration:
+
+ - **REGAL_NO_EMULATION** -- Disable the use of emulation
+ - **REGAL_FORCE_EMULATION** -- Force the use of emulation, even for compatibility contexts with DSA
+
+ - Environment variable configuration:
- - Environment variable configuration: **REGAL_NO_EMULATION**
+ - **REGAL_NO_EMULATION** -- Disable the use of emulation
+ - **REGAL_FORCE_EMULATION** -- Force the use of emulation, even for compatibility contexts with DSA
* OpenGL error checking
@@ -176,8 +176,9 @@
#define BOOST_NO_DEFAULTED_FUNCTIONS
#define BOOST_NO_DELETED_FUNCTIONS
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
#define BOOST_NO_RVALUE_REFERENCES
@@ -8,22 +8,26 @@
// Clang compiler setup.
-#if __has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
-#else
+#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS
#endif
-#if !__has_feature(cxx_rtti)
+#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_RTTI)
# define BOOST_NO_RTTI
#endif
+#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_TYPEID)
+# define BOOST_NO_TYPEID
+#endif
+
#if defined(__int64)
# define BOOST_HAS_MS_INT64
#endif
#define BOOST_HAS_NRVO
// Clang supports "long long" in all compilation modes.
+#define BOOST_HAS_LONG_LONG
#if !__has_feature(cxx_auto_type)
# define BOOST_NO_AUTO_DECLARATIONS
@@ -43,7 +47,9 @@
# define BOOST_NO_DECLTYPE
#endif
-#define BOOST_NO_DECLTYPE_N3276
+#if !__has_feature(cxx_decltype_incomplete_return_types)
+# define BOOST_NO_DECLTYPE_N3276
+#endif
#if !__has_feature(cxx_defaulted_functions)
# define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -62,13 +68,17 @@
#endif
#if !__has_feature(cxx_generalized_initializers)
-# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#endif
#if !__has_feature(cxx_lambdas)
# define BOOST_NO_LAMBDAS
#endif
+#if !__has_feature(cxx_local_type_template_args)
+# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#endif
+
#if !__has_feature(cxx_noexcept)
# define BOOST_NO_NOEXCEPT
#endif
@@ -98,8 +98,8 @@
#define BOOST_NO_DELETED_FUNCTIONS
#define BOOST_NO_EXTERN_TEMPLATE
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
@@ -120,7 +120,7 @@
#define BOOST_HAS_MACRO_USE_FACET
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
// On non-Win32 platforms let the platform config figure this out:
#ifdef _WIN32
@@ -64,7 +64,7 @@
#endif
#if (__EDG_VERSION__ <= 310)
// No support for initializer lists
-# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#endif
#if (__EDG_VERSION__ < 400)
# define BOOST_NO_VARIADIC_MACROS
@@ -82,6 +82,7 @@
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
@@ -42,6 +42,7 @@
#define BOOST_NO_NULLPTR
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_DELETED_FUNCTIONS
@@ -71,8 +71,9 @@
#define BOOST_NO_DELETED_FUNCTIONS
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
@@ -146,9 +146,6 @@
# endif
#endif
-// C++0x features not implemented in any GCC version
-//
-#define BOOST_NO_TEMPLATE_ALIASES
// C++0x features in 4.3.n and later
//
@@ -182,7 +179,7 @@
# define BOOST_NO_AUTO_MULTIDECLARATIONS
# define BOOST_NO_CHAR16_T
# define BOOST_NO_CHAR32_T
-# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
# define BOOST_NO_DEFAULTED_FUNCTIONS
# define BOOST_NO_DELETED_FUNCTIONS
#endif
@@ -196,6 +193,7 @@
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
# define BOOST_NO_LAMBDAS
+# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
# define BOOST_NO_RAW_LITERALS
# define BOOST_NO_UNICODE_LITERALS
#endif
@@ -217,6 +215,9 @@
#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
#endif
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
+# define BOOST_NO_TEMPLATE_ALIASES
+#endif
// C++0x features not supported at all yet
//
#define BOOST_NO_DECLTYPE_N3276
@@ -43,12 +43,13 @@
# define BOOST_NO_CHAR32_T
# define BOOST_NO_DEFAULTED_FUNCTIONS
# define BOOST_NO_DELETED_FUNCTIONS
-# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
# define BOOST_NO_SCOPED_ENUMS
# define BOOST_NO_SFINAE_EXPR
# define BOOST_NO_SCOPED_ENUMS
# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
# define BOOST_NO_LAMBDAS
+# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
# define BOOST_NO_RAW_LITERALS
# define BOOST_NO_UNICODE_LITERALS
# define BOOST_NO_NOEXCEPT
@@ -104,8 +104,9 @@
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_EXTERN_TEMPLATE
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
@@ -205,6 +205,7 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
// http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler/
//
//# undef BOOST_NO_LAMBDAS
+//# undef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
//# undef BOOST_NO_DECLTYPE
//# undef BOOST_NO_AUTO_DECLARATIONS
//# undef BOOST_NO_AUTO_MULTIDECLARATIONS
@@ -216,6 +217,7 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
# undef BOOST_NO_DELETED_FUNCTIONS
# undef BOOST_NO_DEFAULTED_FUNCTIONS
# undef BOOST_NO_LAMBDAS
+# undef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
# undef BOOST_NO_DECLTYPE
# undef BOOST_NO_AUTO_DECLARATIONS
# undef BOOST_NO_AUTO_MULTIDECLARATIONS
@@ -240,7 +242,7 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
//
// Although the Intel compiler is capable of supporting these, it appears not to in MSVC compatibility mode:
//
-# define BOOST_NO_INITIALIZER_LISTS
+# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
# define BOOST_NO_VARIADIC_TEMPLATES
# define BOOST_NO_DELETED_FUNCTIONS
# define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -104,8 +104,9 @@
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_EXTERN_TEMPLATE
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
@@ -52,8 +52,9 @@
#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_NO_EXTERN_TEMPLATE
#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#define BOOST_NO_LAMBDAS
+#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
#define BOOST_NO_NOEXCEPT
#define BOOST_NO_NULLPTR
#define BOOST_NO_RAW_LITERALS
Oops, something went wrong.

0 comments on commit 4bcf96e

Please sign in to comment.