[adobe-source-commits] adobe-source/third_party/boost_tp/adobe boost_1_33_1_patch_01.txt,1.2,1.3 patch_boost.sh,1.5,1.6

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1031/third_party/boost_tp/adobe

Modified Files:
	boost_1_33_1_patch_01.txt patch_boost.sh 
Log Message:
asl 1.0.13

Index: boost_1_33_1_patch_01.txt
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe/boost_1_33_1_patch_01.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost_1_33_1_patch_01.txt	6 Jan 2006 18:35:28 -0000	1.2
--- boost_1_33_1_patch_01.txt	3 Feb 2006 18:20:50 -0000	1.3
***************
*** 1,2 ****
--- 1,25 ----
+ diff -ruN boost_1_33_1/boost/cast.hpp boost/boost/cast.hpp
+ --- boost_1_33_1/boost/cast.hpp	2005-06-27 08:05:11.000000000 -0700
+ +++ boost/boost/cast.hpp	2006-01-03 09:28:24.000000000 -0800
+ @@ -49,6 +49,7 @@
+  # include <boost/type.hpp>
+  # include <boost/limits.hpp>
+  # include <boost/detail/select_type.hpp>
+ +# include <boost/detail/workaround.hpp>
+  
+  //  It has been demonstrated numerous times that MSVC 6.0 fails silently at link
+  //  time if you use a template function which has template parameters that don't
+ @@ -92,7 +93,11 @@
+      template <class Target, class Source>
+      inline Target polymorphic_downcast(Source* x BOOST_EXPLICIT_DEFAULT_TARGET)
+      {
+ +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
+ +        assert( static_cast<const Source*>(dynamic_cast<Target>(x)) == x );  // detect logic error
+ +#else
+          assert( dynamic_cast<Target>(x) == x );  // detect logic error
+ +#endif
+          return static_cast<Target>(x);
+      }
+  
  diff -ruN boost_1_33_1/boost/date_time/time_resolution_traits.hpp boost/boost/date_time/time_resolution_traits.hpp
  --- boost_1_33_1/boost/date_time/time_resolution_traits.hpp	2003-12-02 19:01:05.000000000 -0800
***************
*** 129,161 ****
           flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ;
           }
- diff -ruN boost_1_33_1/tools/build/v2/tools/msvc.jam boost/tools/build/v2/tools/msvc.jam
- --- boost_1_33_1/tools/build/v2/tools/msvc.jam	2005-07-15 06:35:58.000000000 -0700
- +++ boost/tools/build/v2/tools/msvc.jam	2005-12-06 14:58:39.000000000 -0800
- @@ -278,10 +278,25 @@
-      $(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)" && $(RM) "$(RSP)" 
-  }
-  
- -actions compile.rc
- +# ADOBE :	This change allows for a version to be set inside the RC compiler
- +#		so we can include version-dependent manifest files
- +
- +if ! [ MATCH ^([67].*) : $(version) ]
-  {
- -    $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
- +	actions compile.rc
- +	{
- +		$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=8 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
- +	}
-  }
- +else
- +{
- +	actions compile.rc
- +	{
- +		$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=7 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
- +	}
- +}
- +
- +# ADOBE end changes
-  
-  # Declare flags and action for linking
-  flags msvc.link PDB_LINKFLAG <debug-symbols>on/<debug-store>database : /PDB: ; # not used yet
--- 152,153 ----

Index: patch_boost.sh
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe/patch_boost.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** patch_boost.sh	6 Jan 2006 18:35:28 -0000	1.5
--- patch_boost.sh	3 Feb 2006 18:20:50 -0000	1.6
***************
*** 8,18 ****
  
  if [ ! -d boost_1_33_1 ]; then
! 	echo "You must have a source directory (boost_1_33_1) in order to patch!"
! 	exit 1;
  fi
  
  if [ ! -d boost ]; then
! 	echo "You must have a destination directory (boost) in order to patch!"
! 	exit 1;
  fi
  
--- 8,18 ----
  
  if [ ! -d boost_1_33_1 ]; then
!     echo "You must have a source directory (boost_1_33_1) in order to patch!"
!     exit 1;
  fi
  
  if [ ! -d boost ]; then
!     echo "You must have a destination directory (boost) in order to patch!"
!     exit 1;
  fi