Attachment #134270 for bug #118656




CXXFLAGS="$CXXFLAGS_save"
],[AC_MSG_WARN(No --with-stlport-library=DIR was specified)])


# Test for 64-bit platforms
AC_CHECK_HEADERS( [stdlib.h inttypes.h stdint.h] )
AC_MSG_CHECKING([if platform is 64-bit])
AC_TRY_COMPILE( 
[#include <stdlib.h>
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
], 
[size_t j; 
 uint64_t* i = &j;
], [AC_MSG_RESULT([yes]); CPPFLAGS="$CPPFLAGS -D_OCC64"],
   [AC_MSG_RESULT([no])] )

AC_ENABLE_DEBUG(yes)
AC_DISABLE_PRODUCTION





dnl Process this file with autoconf to produce a configure script.
AC_INIT([OpenCAS], [5.0DVP1])
AC_CONFIG_AUX_DIR(make)
AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
dnl AM_CONFIG_SRCDIR(src/Standard/Standard.cxx)



AC_LANG([C])
CFLAGS_save=$CFLAGS
CFLAGS="$CFLAGS $GL_INCLUDE"
AC_CHECK_TYPE(_GLUfuncptr,[],[CFLAGS_save="-DNOGLUfuncptr=1 $CFLAGS_save"],[#include "GL/glu.h"])
CFLAGS="$CFLAGS_save"


INCLUDE="$STLPort_INCLUDES $INCLUDE"
CPPFLAGS_save=$CPPFLAGS
CPPFLAGS="$INCLUDE $CPPFLAGS"
CXXFLAGS_save=$CXXFLAGS
CXXFLAGS="$INCLUDE $CXXFLAGS"
LDFLAGS_save=$LDFLAGS
if test -d "${with_stlport_library}"  ; then
  STLPort_LIB="-L`(cd  ${with_stlport_library}; pwd)` -l$STLPort_LIB_CC"

Lines 29-34 Link Here

(-)occ6.2/ros/src/LDOM/LDOM_OSStream.hxx (+1 lines)
29	#include <Standard_Boolean.hxx>	29	#include <Standard_Boolean.hxx>
30		30
31	#include <stdlib.h>	31	#include <stdlib.h>
		32	#include <stdio.h>
32		33
33	class LDOM_StringElem; // defined in cxx file	34	class LDOM_StringElem; // defined in cxx file
34		35

Lines 29-34 Link Here

(-)occ6.2/ros/inc/LDOM_OSStream.hxx (+1 lines)
29	#include <Standard_Boolean.hxx>	29	#include <Standard_Boolean.hxx>
30		30
31	#include <stdlib.h>	31	#include <stdlib.h>
		32	#include <stdio.h>
32		33
33	class LDOM_StringElem; // defined in cxx file	34	class LDOM_StringElem; // defined in cxx file
34		35

Lines 13-18 Link Here

(-)occ6.2/ros/src/WOKTools/WOKTools_Options.cxx (+1 lines)
13		13
14	#include <string.h>	14	#include <string.h>
15	#include <stdlib.h>	15	#include <stdlib.h>
		16	#include <stdio.h>
16		17
17	#include <WOKTools_Options.ixx>	18	#include <WOKTools_Options.ixx>
18		19

Lines 21-26 Link Here

(-)occ6.2/ros/src/Standard/Standard_Transient_proto.hxx (+3 lines)
21	//! Abstract class which forms the root of the entire	21	//! Abstract class which forms the root of the entire
22	//! Transient class hierarchy.	22	//! Transient class hierarchy.
23		23
		24	class Handle(Standard_Transient);
		25	Standard_EXPORT Handle_Standard_Type& Standard_Transient_Type_();
		26
24	class Standard_Transient	27	class Standard_Transient
25	{	28	{
26	//---- uses the friend Standard_Transient class	29	//---- uses the friend Standard_Transient class

Lines 21-26 Link Here

(-)occ6.2/ros/inc/Standard_Transient_proto.hxx (+3 lines)
21	//! Abstract class which forms the root of the entire	21	//! Abstract class which forms the root of the entire
22	//! Transient class hierarchy.	22	//! Transient class hierarchy.
23		23
		24	class Handle(Standard_Transient);
		25	Standard_EXPORT Handle_Standard_Type& Standard_Transient_Type_();
		26
24	class Standard_Transient	27	class Standard_Transient
25	{	28	{
26	//---- uses the friend Standard_Transient class	29	//---- uses the friend Standard_Transient class

Lines 190-195 Link Here

(-)occ6.2/ros/inc/Units_Dimensions.hxx (+3 lines)
190		190
191	};	191	};
192		192
		193	Standard_EXPORT Handle(Units_Dimensions) operator *(const Handle(Units_Dimensions)&,const Handle(Units_Dimensions)&);
		194	Standard_EXPORT Handle(Units_Dimensions) operator /(const Handle(Units_Dimensions)&,const Handle(Units_Dimensions)&);
		195	Standard_EXPORT Handle(Units_Dimensions) pow(const Handle(Units_Dimensions)&,const Standard_Real);
193		196
194	#include <Units_Dimensions.lxx>	197	#include <Units_Dimensions.lxx>
195		198

Lines 123-128 Link Here

(-)occ6.2/ros/inc/Units_Quantity.hxx (+1 lines)
123		123
124	};	124	};
125		125
		126	Standard_EXPORT Standard_Boolean operator ==(const Handle(Units_Quantity)&,const Standard_CString);
126		127
127	#include <Units_Quantity.lxx>	128	#include <Units_Quantity.lxx>
128		129





};

Standard_EXPORT Handle(Units_Token) operator +(const Handle(Units_Token)&,const Standard_Integer);
Standard_EXPORT Handle(Units_Token) operator +(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Handle(Units_Token) operator -(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Handle(Units_Token) operator *(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Handle(Units_Token) operator /(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Handle(Units_Token) pow(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Handle(Units_Token) pow(const Handle(Units_Token)&,const Standard_Real);
Standard_EXPORT Standard_Boolean operator ==(const Handle(Units_Token)&,const Standard_CString);
Standard_EXPORT Standard_Boolean operator !=(const Handle(Units_Token)&,const Standard_CString);
Standard_EXPORT Standard_Boolean operator <=(const Handle(Units_Token)&,const Standard_CString);
Standard_EXPORT Standard_Boolean operator >(const Handle(Units_Token)&,const Standard_CString);
Standard_EXPORT Standard_Boolean operator >(const Handle(Units_Token)&,const Handle(Units_Token)&);
Standard_EXPORT Standard_Boolean operator >=(const Handle(Units_Token)&,const Handle(Units_Token)&);

#include <Units_Token.lxx>


Lines 152-157 Link Here

(-)occ6.2/ros/inc/Units_Unit.hxx (+1 lines)
152		152
153	};	153	};
154		154
		155	Standard_EXPORT Standard_Boolean operator ==(const Handle(Units_Unit)&,const Standard_CString);
155		156
156	#include <Units_Unit.lxx>	157	#include <Units_Unit.lxx>
157		158

Lines 9-14 Link Here

(-)occ6.2/ros/src/Standard/Standard_Persistent.cxx (+1 lines)
9	#include <Standard_TypeMismatch.hxx>	9	#include <Standard_TypeMismatch.hxx>
10	#include <Standard_NotImplemented.hxx>	10	#include <Standard_NotImplemented.hxx>
11	#include <Standard_Type.hxx>	11	#include <Standard_Type.hxx>
		12	#include <Standard_ShallowDump_proto.hxx>
12		13
13	//	14	//
14	// The Initialization of the Standard_Persistent variables	15	// The Initialization of the Standard_Persistent variables

Lines 61-67 Link Here

(-)occ6.2/ros/inc/Standard_ErrorHandlerCallback.hxx (-1 / +1 lines)
61	void RegisterCallback() ;	61	void RegisterCallback() ;
62	//! Unregisters this callback object from the error handler. <br>	62	//! Unregisters this callback object from the error handler. <br>
63	void UnregisterCallback() ;	63	void UnregisterCallback() ;
64	virtual Standard_EXPORT Standard_ErrorHandlerCallback::~Standard_ErrorHandlerCallback ();	64	virtual Standard_EXPORT ~Standard_ErrorHandlerCallback ();
65		65
66	//! The callback function to perform necessary callback action. <br>	66	//! The callback function to perform necessary callback action. <br>
67	//! Called by the exception handler when it is being destroyed but <br>	67	//! Called by the exception handler when it is being destroyed but <br>

Lines 792-798 Link Here

(-)occ6.2/ros/src/BOPTest/BOPTest_LowCommands.cxx (-1 / +1 lines)
792	//=======================================================================	792	//=======================================================================
793	class X_Chr {	793	class X_Chr {
794	public:	794	public:
795	X_Chr::X_Chr() {	795	X_Chr() {
796	Reset();	796	Reset();
797	}	797	}
798	void Reset() {	798	void Reset() {

Lines 26-31 Link Here

(-)occ6.2/ros/src/Standard/Standard_SStream.cxx (-1 / +1 lines)
26	ostream& operator<< (ostream& anOstream, Standard_SStream& aSStream)	26	ostream& operator<< (ostream& anOstream, Standard_SStream& aSStream)
27	{	27	{
28	aSStream << "\0";	28	aSStream << "\0";
29	anOstream << aSStream.rdbuf()->str();	29	anOstream << GetSString(aSStream);
30	return anOstream;	30	return anOstream;
31	}	31	}

Return to bug 118656

Lines 629-634 Link Here

(-)occ6.2/ros/configure.in (+18 lines)
629	CXXFLAGS="$CXXFLAGS_save"	629	CXXFLAGS="$CXXFLAGS_save"
630	],[AC_MSG_WARN(No --with-stlport-library=DIR was specified)])	630	],[AC_MSG_WARN(No --with-stlport-library=DIR was specified)])
631		631
		632
		633	# Test for 64-bit platforms
		634	AC_CHECK_HEADERS( [stdlib.h inttypes.h stdint.h] )
		635	AC_MSG_CHECKING([if platform is 64-bit])
		636	AC_TRY_COMPILE(
		637	[#include <stdlib.h>
		638	#ifdef HAVE_INTTYPES_H
		639	#include <inttypes.h>
		640	#endif
		641	#ifdef HAVE_STDINT_H
		642	#include <stdint.h>
		643	#endif
		644	],
		645	[size_t j;
		646	uint64_t* i = &j;
		647	], [AC_MSG_RESULT([yes]); CPPFLAGS="$CPPFLAGS -D_OCC64"],
		648	[AC_MSG_RESULT([no])] )
		649
632	AC_ENABLE_DEBUG(yes)	650	AC_ENABLE_DEBUG(yes)
633	AC_DISABLE_PRODUCTION	651	AC_DISABLE_PRODUCTION
634		652

Lines 1-7 Link Here

(-)occ6.2/ros/configure.in (-5 / +5 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2	AC_INIT(config.h.in)	2	AC_INIT([OpenCAS], [5.0DVP1])
3	AC_CONFIG_AUX_DIR(make)	3	AC_CONFIG_AUX_DIR(make)
4	AM_INIT_AUTOMAKE(OpenCAS,5.0DVP1)	4	AM_INIT_AUTOMAKE([foreign])
5	AC_CANONICAL_HOST	5	AC_CANONICAL_HOST
6	dnl AM_CONFIG_SRCDIR(src/Standard/Standard.cxx)	6	dnl AM_CONFIG_SRCDIR(src/Standard/Standard.cxx)
7		7
Lines 383-389 Link Here
383		383
384	AC_LANG([C])	384	AC_LANG([C])
385	CFLAGS_save=$CFLAGS	385	CFLAGS_save=$CFLAGS
386	CFLAGS="$CXXFLAGS $GL_INCLUDE"	386	CFLAGS="$CFLAGS $GL_INCLUDE"
387	AC_CHECK_TYPE(_GLUfuncptr,[],[CFLAGS_save="-DNOGLUfuncptr=1 $CFLAGS_save"],[#include "GL/glu.h"])	387	AC_CHECK_TYPE(_GLUfuncptr,[],[CFLAGS_save="-DNOGLUfuncptr=1 $CFLAGS_save"],[#include "GL/glu.h"])
388	CFLAGS="$CFLAGS_save"	388	CFLAGS="$CFLAGS_save"
389		389
Lines 604-611 Link Here
604	INCLUDE="$STLPort_INCLUDES $INCLUDE"	604	INCLUDE="$STLPort_INCLUDES $INCLUDE"
605	CPPFLAGS_save=$CPPFLAGS	605	CPPFLAGS_save=$CPPFLAGS
606	CPPFLAGS="$INCLUDE $CPPFLAGS"	606	CPPFLAGS="$INCLUDE $CPPFLAGS"
607	CXXFLAGS_save=$CPPFLAGS	607	CXXFLAGS_save=$CXXFLAGS
608	CXXFLAGS="$INCLUDE $CPPFLAGS"	608	CXXFLAGS="$INCLUDE $CXXFLAGS"
609	LDFLAGS_save=$LDFLAGS	609	LDFLAGS_save=$LDFLAGS
610	if test -d "${with_stlport_library}" ; then	610	if test -d "${with_stlport_library}" ; then
611	STLPort_LIB="-L`(cd ${with_stlport_library}; pwd)` -l$STLPort_LIB_CC"	611	STLPort_LIB="-L`(cd ${with_stlport_library}; pwd)` -l$STLPort_LIB_CC"

Lines 252-257 Link Here

(-)occ6.2/ros/inc/Units_Token.hxx (+13 lines)
252		252
253	};	253	};
254		254
		255	Standard_EXPORT Handle(Units_Token) operator +(const Handle(Units_Token)&,const Standard_Integer);
		256	Standard_EXPORT Handle(Units_Token) operator +(const Handle(Units_Token)&,const Handle(Units_Token)&);
		257	Standard_EXPORT Handle(Units_Token) operator -(const Handle(Units_Token)&,const Handle(Units_Token)&);
		258	Standard_EXPORT Handle(Units_Token) operator *(const Handle(Units_Token)&,const Handle(Units_Token)&);
		259	Standard_EXPORT Handle(Units_Token) operator /(const Handle(Units_Token)&,const Handle(Units_Token)&);
		260	Standard_EXPORT Handle(Units_Token) pow(const Handle(Units_Token)&,const Handle(Units_Token)&);
		261	Standard_EXPORT Handle(Units_Token) pow(const Handle(Units_Token)&,const Standard_Real);
		262	Standard_EXPORT Standard_Boolean operator ==(const Handle(Units_Token)&,const Standard_CString);
		263	Standard_EXPORT Standard_Boolean operator !=(const Handle(Units_Token)&,const Standard_CString);
		264	Standard_EXPORT Standard_Boolean operator <=(const Handle(Units_Token)&,const Standard_CString);
		265	Standard_EXPORT Standard_Boolean operator >(const Handle(Units_Token)&,const Standard_CString);
		266	Standard_EXPORT Standard_Boolean operator >(const Handle(Units_Token)&,const Handle(Units_Token)&);
		267	Standard_EXPORT Standard_Boolean operator >=(const Handle(Units_Token)&,const Handle(Units_Token)&);
255		268
256	#include <Units_Token.lxx>	269	#include <Units_Token.lxx>
257		270