*** boost/config/compiler/vacpp.hpp.orig	Mon Jul  6 04:36:57 2009
--- boost/config/compiler/vacpp.hpp	Fri Oct 22 15:33:17 2010
***************
*** 54,60 ****
--- 54,62 ----
  #endif
  
  // Some versions of the compiler have issues with default arguments on partial specializations
+ #if __IBMCPP__  <= 1010
  #define BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS
+ #endif
   
  //
  // C++0x features
*** boost/function.hpp.orig	Sun Nov 25 13:07:19 2007
--- boost/function.hpp	Fri Oct 22 15:32:12 2010
***************
*** 24,30 ****
  #include <boost/function/detail/prologue.hpp>
  
  // Visual Age C++ doesn't handle the file iteration well
! #if BOOST_WORKAROUND(__IBMCPP__, >= 500)
  #  if BOOST_FUNCTION_MAX_ARGS >= 0
  #    include <boost/function/function0.hpp>
  #  endif
--- 24,30 ----
  #include <boost/function/detail/prologue.hpp>
  
  // Visual Age C++ doesn't handle the file iteration well
! #if BOOST_WORKAROUND(__IBMCPP__, >= 500) && BOOST_WORKAROUND(__IBMCPP__, < 800)
  #  if BOOST_FUNCTION_MAX_ARGS >= 0
  #    include <boost/function/function0.hpp>
  #  endif
*** boost/python/type_id.hpp.orig	Tue Jul 15 17:05:24 2008
--- boost/python/type_id.hpp	Fri Oct 22 15:34:03 2010
***************
*** 34,40 ****
   || defined(_AIX) \
   || (   defined(__sgi) && defined(__host_mips)) \
   || (defined(__hpux) && defined(__HP_aCC)) \
!  || (defined(linux) && defined(__INTEL_COMPILER) && defined(__ICC))
  #  define BOOST_PYTHON_TYPE_ID_NAME
  # endif 
  
--- 34,41 ----
   || defined(_AIX) \
   || (   defined(__sgi) && defined(__host_mips)) \
   || (defined(__hpux) && defined(__HP_aCC)) \
!  || (defined(linux) && defined(__INTEL_COMPILER) && defined(__ICC)) \
!  || (defined(__linux__) && defined(__IBMCPP__))
  #  define BOOST_PYTHON_TYPE_ID_NAME
  # endif 
  
*** boost/serialization/force_include.hpp.orig	Thu Jun 26 15:25:44 2008
--- boost/serialization/force_include.hpp	Fri Oct 22 15:34:12 2010
***************
*** 41,46 ****
--- 41,48 ----
  #       define BOOST_DLLEXPORT __declspec(dllexport)
  #   elif defined(__GNUC__) && (__GNUC__ >= 3)
  #       define BOOST_USED __attribute__ ((used))
+ #   elif defined(__IBMCPP__) && (__IBMCPP__ >= 1110)
+ #       define BOOST_USED __attribute__ ((used))
  #   elif defined(__INTEL_COMPILER) && (BOOST_INTEL_CXX_VERSION >= 800)
  #       define BOOST_USED __attribute__ ((used))
  #   endif
*** boost/tr1/detail/config_all.hpp.orig	Mon Feb 23 10:12:20 2009
--- boost/tr1/detail/config_all.hpp	Fri Oct 22 15:35:06 2010
***************
*** 139,145 ****
  #     define BOOST_TR1_NO_CONFIG_ALL_RECURSION
  #  endif
  #  include_next <utility>
! #  if (__GNUC__ < 3)
  #     include_next <algorithm>
  #     include_next <iterator>
  #  endif
--- 139,145 ----
  #     define BOOST_TR1_NO_CONFIG_ALL_RECURSION
  #  endif
  #  include_next <utility>
! #  if defined(__GNUC__) && (__GNUC__ < 3)
  #     include_next <algorithm>
  #     include_next <iterator>
  #  endif
*** libs/iostreams/test/restrict_test.cpp.orig	Sat Mar 22 17:45:55 2008
--- libs/iostreams/test/restrict_test.cpp	Fri Oct 22 15:36:56 2010
***************
*** 9,18 ****
--- 9,24 ----
  // replace BOOST_RESTRICT with BOOST_IOSTREAMS_RESTRICT here, since that
  // would interfere with the oepration of the header 
  // <boost/iostreams/restrict.hpp>
+ 
  #ifndef BOOST_RESTRICT
+ # if defined(__IBMCPP__)
+ #  define BOOST_RESTRICT slice
+ #  define BOOST_RESTRICT_HEADER <boost/iostreams/slice.hpp>
+ # else
  #  define BOOST_RESTRICT restrict
  #  define BOOST_RESTRICT_HEADER <boost/iostreams/restrict.hpp>
  # endif
+ #endif
  #include BOOST_RESTRICT_HEADER
  
  #include <algorithm>         // equal.
*** libs/regex/src/regex.cpp.orig	Mon Mar 20 05:36:12 2006
--- libs/regex/src/regex.cpp	Fri Oct 22 15:36:59 2010
***************
*** 221,236 ****
  }
  #endif
  
- #if defined(__IBMCPP__) && defined(BOOST_REGEX_DYN_LINK)
- //
- // Is this correct - linker complains without it ?
- //
- int main()
- { 
-    return 0; 
- }
  
- #endif
  
  
  
--- 221,227 ----