Attachment #97258 for bug #147952




                   + (fractional_seconds_type(minutes)*60) 
                   + seconds)*res_adjust()) + fs) * -1);
      }

		/* ADOBE (fbrereto) :	There is a compiler bug in Darwin GCC doing a
								release build that says it is possible to
								reach the end of this function block without
								returning anything. Eliminating the else
								block wrapper fixed the bug.
		*/

		return (((fractional_seconds_type(hours)*3600) 
				 + (fractional_seconds_type(minutes)*60) 
				 + seconds)*res_adjust()) + fs;
    }
    
  };

Lines 41-46 Link Here

(-)boost_1_33_1/boost/type_traits/detail/bool_trait_def.hpp (+4 lines)
41	# define BOOST_TT_AUX_BOOL_C_BASE(C) : ::boost::integral_constant<bool,C>	41	# define BOOST_TT_AUX_BOOL_C_BASE(C) : ::boost::integral_constant<bool,C>
42	#endif	42	#endif
43		43
		44	/* ADOBE (sparent@adobe.com) : Added undef to avoid multiple define warning in GCC */
		45	#ifdef BOOST_TT_AUX_BOOL_TRAIT_DEF1
		46	#undef BOOST_TT_AUX_BOOL_TRAIT_DEF1
		47	#endif
44		48
45	#define BOOST_TT_AUX_BOOL_TRAIT_DEF1(trait,T,C) \	49	#define BOOST_TT_AUX_BOOL_TRAIT_DEF1(trait,T,C) \
46	template< typename T > struct trait \	50	template< typename T > struct trait \

Lines 296-302 Link Here

(-)boost_1_33_1/libs/thread/src/recursive_mutex.cpp (-3 / +15 lines)
296		296
297	res = pthread_mutex_init(&m_mutex, &attr);	297	res = pthread_mutex_init(&m_mutex, &attr);
298	{	298	{
299	int res = pthread_mutexattr_destroy(&attr);	299	// ADOBE (fbrereto) : this fixes an unused variable warning
		300	// in gcc release builds under darwin.
		301	# if !defined(NDEBUG)
		302	int res =
		303	# endif
		304	pthread_mutexattr_destroy(&attr);
		305
300	assert(res == 0);	306	assert(res == 0);
301	}	307	}
302	if (res != 0)	308	if (res != 0)
Lines 452-459 Link Here
452		458
453	res = pthread_mutex_init(&m_mutex, &attr);	459	res = pthread_mutex_init(&m_mutex, &attr);
454	{	460	{
455	int res = pthread_mutexattr_destroy(&attr);	461	// ADOBE (fbrereto) : this fixes an unused variable warning
456	assert(res == 0);	462	// in gcc release builds under darwin.
		463	# if !defined(NDEBUG)
		464	int res =
		465	# endif
		466	pthread_mutexattr_destroy(&attr);
		467
		468	assert(res == 0);
457	}	469	}
458	if (res != 0)	470	if (res != 0)
459	throw thread_resource_error();	471	throw thread_resource_error();

Lines 41-46 Link Here

(-)boost_1_33_1/tools/build/v2/tools/darwin.jam (-1 / +15 lines)
41		41
42	feature framework : : free ;	42	feature framework : : free ;
43		43
		44	# ADOBE : Adding archtecture variant to build 1386, ppc, or universal binaries
		45
		46	feature isysroot : : free ;
		47
		48	feature arch : none i386 fat : composite ; # We don't turn on link-incompatible for now;
		49	flags darwin.compile OPTIONS <arch>fat : -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk ;
		50	flags darwin.compile OPTIONS <arch>i386 : -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk ;
		51
		52	# ADOBE end changes
		53
44	flags darwin.compile OPTIONS <link>shared : -dynamic ;	54	flags darwin.compile OPTIONS <link>shared : -dynamic ;
45	flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp ;	55	flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp ;
46		56
Lines 64-69 Link Here
64		74
65	actions piecemeal archive	75	actions piecemeal archive
66	{	76	{
67	ar -c -r -s $(ARFLAGS) "$(<:T)" "$(>:T)"	77	# ADOBE : We use libtool instead of ar to support universal binary linking
		78
		79	libtool -static -o "$(<:T)" $(ARFLAGS) "$(>:T)"
		80
		81	# ADOBE end changes
68	}	82	}
69		83

Lines 236-244 Link Here

(-)boost_1_33_1/tools/build/v2/tools/gcc.jam (-3 / +8 lines)
236	{	236	{
237	# we can't pass -s to ld unless we also pass -static	237	# we can't pass -s to ld unless we also pass -static
238	# so we removed -s completly from OPTIONS and add it	238	# so we removed -s completly from OPTIONS and add it
239	# to ST_OPTIONS	239	# to ST_OPTIONS
240	flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : -s	240
241	: unchecked ;	241	# ADOBE : XCode 2.2 does not strip properly; removing this setting
		242	# until Apple figures out what the problem is
		243	#flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : -s
		244	# : unchecked ;
		245	# ADOBE end changes
		246
242	flags $(toolset).link RPATH $(condition) : <dll-path> : unchecked ;	247	flags $(toolset).link RPATH $(condition) : <dll-path> : unchecked ;
243	flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ;	248	flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ;
244	}	249	}

Lines 278-287 Link Here

(-)boost_1_33_1/tools/build/v2/tools/msvc.jam (-2 / +17 lines)
278	$(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)" && $(RM) "$(RSP)"	278	$(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)" && $(RM) "$(RSP)"
279	}	279	}
280		280
281	actions compile.rc	281	# ADOBE : This change allows for a version to be set inside the RC compiler
		282	# so we can include version-dependent manifest files
		283
		284	if ! [ MATCH ^([67].*) : $(version) ]
282	{	285	{
283	$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"	286	actions compile.rc
		287	{
		288	$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=8 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
		289	}
284	}	290	}
		291	else
		292	{
		293	actions compile.rc
		294	{
		295	$(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=7 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)"
		296	}
		297	}
		298
		299	# ADOBE end changes
285		300
286	# Declare flags and action for linking	301	# Declare flags and action for linking
287	flags msvc.link PDB_LINKFLAG <debug-symbols>on/<debug-store>database : /PDB: ; # not used yet	302	flags msvc.link PDB_LINKFLAG <debug-symbols>on/<debug-store>database : /PDB: ; # not used yet

Return to bug 147952

Lines 120-130 Link Here

(-)boost_1_33_1/boost/date_time/time_resolution_traits.hpp (-5 / +11 lines)
120	+ (fractional_seconds_type(minutes)*60)	120	+ (fractional_seconds_type(minutes)*60)
121	+ seconds)res_adjust()) + fs) -1);	121	+ seconds)res_adjust()) + fs) -1);
122	}	122	}
123	else{	123
124	return (((fractional_seconds_type(hours)*3600)	124	/* ADOBE (fbrereto) : There is a compiler bug in Darwin GCC doing a
125	+ (fractional_seconds_type(minutes)*60)	125	release build that says it is possible to
126	+ seconds)*res_adjust()) + fs;	126	reach the end of this function block without
127	}	127	returning anything. Eliminating the else
		128	block wrapper fixed the bug.
		129	*/
		130
		131	return (((fractional_seconds_type(hours)*3600)
		132	+ (fractional_seconds_type(minutes)*60)
		133	+ seconds)*res_adjust()) + fs;
128	}	134	}
129		135
130	};	136	};