dbertoni    02/04/11 23:30:21

  Modified:    c/src/Include SolarisDefinitions.hpp
  Log:
  Updated ifdefs.
  
  Revision  Changes    Path
  1.11      +6 -16     xml-xalan/c/src/Include/SolarisDefinitions.hpp
  
  Index: SolarisDefinitions.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/Include/SolarisDefinitions.hpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SolarisDefinitions.hpp    10 Apr 2002 04:41:20 -0000      1.10
  +++ SolarisDefinitions.hpp    12 Apr 2002 06:30:21 -0000      1.11
  @@ -71,30 +71,20 @@
   #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
   
   
  +#if __SUNPRO_CC_COMPAT >= 5
  +
  +#define XALAN_SIZE_T_IN_NAMESPACE_STD
  +#define XALAN_SIGNAL_IN_STD
  +
  +#else
   
   // Sun Workshop 4.2 _does_ support new cast syntax, but it's
   // broken with extra cv-qualifiers, so we'll use old-style casts.
   #define XALAN_OLD_STYLE_CASTS
   
  -
  -
   // Standard allocators don't seem to work correctly with STLport.
   // I don't know if this is their bug, or ours...
   #define XALAN_NO_STD_ALLOCATORS
  -
  -
  -
  -#if __SUNPRO_CC_COMPAT >= 5
  -
  -#define XALAN_SIZE_T_IN_NAMESPACE_STD
  -#define XALAN_SIGNAL_IN_STD
  -
  -// A copy constructor should not need to be accessible to allow
  -// implicit construction from a conversion constructor.  However,
  -// later versions of the Sun compiler do not agree...
  -#define XALAN_IMPLICIT_CONSTRUCTION_REQUIRES_COPY_CONSTRUCTOR
  -
  -#else
   
   #define XALAN_STLPORT_STL
   #define XALAN_NO_DEFAULT_BUILTIN_ARRAY_INITIALIZATION
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to