pegasus/src/Pegasus/Common/Platform_WIN32_IX86_MSVC.h - diff

Return to Platform_WIN32_IX86_MSVC.h CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Platform_WIN32_IX86_MSVC.h between version 1.34 and 1.44

version 1.34, 2006/01/30 16:17:07

version 1.44, 2010/01/29 14:33:06

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a

// copy of this software and associated documentation files (the "Software"),

// EMC Corporation; Symantec Corporation; The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// Permission is hereby granted, free of charge, to any person obtaining a copy

// and/or sell copies of the Software, and to permit persons to whom the

// of this software and associated documentation files (the "Software"), to

// Software is furnished to do so, subject to the following conditions:

// deal in the Software without restriction, including without limitation the

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// The above copyright notice and this permission notice shall be included

// sell copies of the Software, and to permit persons to whom the Software is

// in all copies or substantial portions of the Software.

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 57

Line 55

#define PEGASUS_HAVE_NAMESPACES

#define PEGASUS_HAVE_EXPLICIT

#define PEGASUS_HAVE_MUTABLE

// #define PEGASUS_HAVE_FOR_SCOPE

#define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION

Line 71

Line 65

#define PEGASUS_DISABLE_INTERNAL_INLINES

#define PEGASUS_SOCKET SOCKET

#define PEGASUS_INVALID_SOCKET INVALID_SOCKET

// Exclude rarely-used stuff from Windows headers

// Note: this is also an easy way to avoid the often introduced

// winsock.h/winsock2.h mixing compiler error problems.

Line 100

Line 91

// Suppress this warning : "'this' : used in base member initializer list"

#pragma warning ( disable : 4355 )

// Suppress this warning: 'type' : forcing value to bool 'true' or 'false' (performance warning)

// 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

// __int64 and unsigned __int64. We declare them if the _MSC_VER is less than

Line 131

Line 134

}

#endif /* _MSC_VER < 1300 */

#define PEGASUS_SOCKLEN_T int

#if _MSC_VER > 1400

#define PEGASUS_HAVE_WINDOWS_IPV6ONLY

#endif

#define PEGASUS_HAVE_WINDOWS_THREADS

/* use OpenPegasus semaphore based read/write locking mechanism */

#define PEGASUS_USE_SEMAPHORE_RWLOCK

#define PEGASUS_INTEGERS_BOUNDARY_ALIGNED

#endif /* Pegasus_Platform_WIN32_IX86_MSVC_h */

Legend:

Removed from v.1.34
changed lines
	Added in v.1.44

No CVS admin address has been configured