[hpoussin] 30379: Silent some MSVC warnings

Author: hpoussin
Date: Mon Nov 12 13:06:05 2007
New Revision: 30379

URL: http://svn.reactos.org/svn/reactos?rev=30379&view=rev
Log:
Silent some MSVC warnings

Modified:
    trunk/reactos/base/shell/explorer/utility/xmlstorage.h
    trunk/reactos/include/psdk/windef.h

Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utility...
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original)
+++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Mon Nov 12 13:06:05 2007
@@ -39,6 +39,9 @@

#ifndef _XMLSTORAGE_H

+#ifndef __REACTOS__
+#include <strstream>
+#endif

#ifdef UNICODE
 #ifndef _UNICODE
@@ -2242,7 +2245,7 @@
    typedef std::char_traits<_E> _Tr;

explicit fast_ostringbuffer()
-		{_Init(0, 0, std::_Noread);}	// optimized for ios::out mode
+		{_Init(0, 0, /*std::_Noread*/4);}	// optimized for ios::out mode

virtual ~fast_ostringbuffer()
    	{_Tidy();}
@@ -2271,10 +2274,10 @@
    		else if (_ALSIZE < _Alsize)
    			_Alsize = _ALSIZE;

-			if (_Strmode & std::_Allocated)
+			if (_Strmode & std::strstreambuf::_Allocated)
    			_Al.deallocate(eback(), _Os);

-			_Strmode |= std::_Allocated;
+			_Strmode |= std::strstreambuf::_Allocated;

if (_Os == 0)
    			{_Seekhigh = _P;
@@ -2288,24 +2291,24 @@

return _C;}}

-	void _Init(const _E *_S, size_t _N, std::_Strstate _M)
+	void _Init(const _E *_S, size_t _N, std::strstreambuf::_Strstate _M)
    	{_Pendsave = 0, _Seekhigh = 0;
    	_Alsize = _MINSIZE, _Strmode = _M;
    	setg(0, 0, 0);
    	setp(0, 0);}

void _Tidy()
-		{if (_Strmode & std::_Allocated)
+		{if (_Strmode & std::strstreambuf::_Allocated)
    		_Al.deallocate(eback(), (pptr() != 0 ? epptr() : egptr()) - eback());
    	_Seekhigh = 0;
-		_Strmode &= ~std::_Allocated;}
+		_Strmode &= ~std::strstreambuf::_Allocated;}

private:
    enum {_ALSIZE = 65536/*512*/, _MINSIZE = 32768/*32*/};	// bigger buffer sizes

_E *_Pendsave, *_Seekhigh;
    int _Alsize;
-	std::_Strstate _Strmode;
+	std::strstreambuf::_Strstate _Strmode;
    std::allocator<_E> _Al;
 };

Modified: trunk/reactos/include/psdk/windef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=3...
==============================================================================
--- trunk/reactos/include/psdk/windef.h (original)
+++ trunk/reactos/include/psdk/windef.h Mon Nov 12 13:06:05 2007
@@ -166,7 +166,7 @@
 #define min __min
 #define max __max

-#elif !defined(NOMINMAX)
+#elif !defined(_MSC_VER) && !defined(NOMINMAX)

#ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))