INTEGRATION: CWS net2003 (1.5.20); FILE MERGED
2003/08/13 07:59:55 obo 1.5.20.1: #11136# .net 2003
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: storbase.hxx,v $
|
||||
*
|
||||
* $Revision: 1.5 $
|
||||
* $Revision: 1.6 $
|
||||
*
|
||||
* last change: $Author: hr $ $Date: 2003-03-27 14:06:35 $
|
||||
* last change: $Author: vg $ $Date: 2003-10-06 17:31:55 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -60,7 +60,7 @@
|
||||
************************************************************************/
|
||||
|
||||
#ifndef _STORE_STORBASE_HXX_
|
||||
#define _STORE_STORBASE_HXX_ "$Revision: 1.5 $"
|
||||
#define _STORE_STORBASE_HXX_ "$Revision: 1.6 $"
|
||||
|
||||
#ifndef _SAL_TYPES_H_
|
||||
#include <sal/types.h>
|
||||
@@ -109,7 +109,7 @@
|
||||
*
|
||||
*======================================================================*/
|
||||
/* MSVC 6.0 still has std functions in global namespace */
|
||||
#if defined(_MSC_VER) && (_MSC_VER <= 1300)
|
||||
#if defined(_MSC_VER) && (_MSC_VER <= 1310)
|
||||
#define __STORE_CSTD
|
||||
#else
|
||||
#define __STORE_CSTD std
|
||||
|
Reference in New Issue
Block a user