(file) Return to Platform_WIN32_IX86_MSVC.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Platform_WIN32_IX86_MSVC.h between version 1.29 and 1.39

version 1.29, 2005/11/09 22:34:09 version 1.39, 2007/05/29 17:21:07
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 55 
Line 57 
  
 #define PEGASUS_HAVE_NAMESPACES #define PEGASUS_HAVE_NAMESPACES
  
 #define PEGASUS_HAVE_EXPLICIT  
   
 #define PEGASUS_HAVE_MUTABLE  
   
 // #define PEGASUS_HAVE_FOR_SCOPE // #define PEGASUS_HAVE_FOR_SCOPE
  
 #define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION #define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION
Line 69 
Line 67 
  
 #define PEGASUS_DISABLE_INTERNAL_INLINES #define PEGASUS_DISABLE_INTERNAL_INLINES
  
 #define PEGASUS_SOCKET SOCKET  
 #define PEGASUS_INVALID_SOCKET INVALID_SOCKET  
   
 // Exclude rarely-used stuff from Windows headers // Exclude rarely-used stuff from Windows headers
 // Note: this is also an easy way to avoid the often introduced // Note: this is also an easy way to avoid the often introduced
 // winsock.h/winsock2.h mixing compiler error problems. // winsock.h/winsock2.h mixing compiler error problems.
Line 98 
Line 93 
 // Suppress this warning : "'this' : used in base member initializer list" // Suppress this warning : "'this' : used in base member initializer list"
 #pragma warning ( disable : 4355 ) #pragma warning ( disable : 4355 )
  
   // Suppress this warning: 'type' : forcing value to bool 'true' or 'false'
   // (performance warning)
   #ifdef PEGASUS_INTERNALONLY
   #pragma warning( disable : 4800 )
   #endif
   
   // VC 8 specific pragmas
   #if _MSC_VER >= 1400
   // Suppress this warning: '<function>' was declared deprecated
   // This warning is supported beginning with VC 8.
   #pragma warning ( disable : 4996 )
   
   // Suppress this warning: behavior change: an object of POD type constructed
   // with an initializer of the form () will be default-initialized
   #pragma warning ( disable : 4345 )
   #endif
   
 // //
 // Prior to Microsoft Visual Studio 7.0, there were no stream inserters for // Prior to Microsoft Visual Studio 7.0, there were no stream inserters for
 // __int64 and unsigned __int64. We declare them if the _MSC_VER is less than // __int64 and unsigned __int64. We declare them if the _MSC_VER is less than
 // 1300 (subtract 600 to get the version of Visual Studio). Look in // 1300 (subtract 600 to get the version of Visual Studio). Look in
 // SystemWindows.cpp for the definitions. // SystemWindows.cpp for the definitions.
 // //
 #if (_MSC_VER < 1300)  #if (_MSC_VER < 1300) && defined(PEGASUS_INTERNALONLY) && defined(__cplusplus)
 # include <iostream> # include <iostream>
 namespace std namespace std
 { {
Line 124 
Line 136 
 } }
 #endif /* _MSC_VER < 1300 */ #endif /* _MSC_VER < 1300 */
  
   #define PEGASUS_HAVE_WINDOWS_THREADS
   
 #endif /* Pegasus_Platform_WIN32_IX86_MSVC_h */ #endif /* Pegasus_Platform_WIN32_IX86_MSVC_h */


Legend:
Removed from v.1.29  
changed lines
  Added in v.1.39

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2