Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / anystr.h

diff --git a/include/wx/anystr.h b/include/wx/anystr.h
index 678741bdef0f2b5866b907cde21ac62dc8082a1b..8eebaf9b0381cbd5054ad1c18848e0318ada9174 100644 (file)
--- a/include/wx/anystr.h
+++ b/include/wx/anystr.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyStrPtr class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-03-23
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -136,13 +135,5 @@ private:
     wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr);
 };
 
-// at least for VC6 and VC7 these operators are needed too, otherwise boolean
-// expressions involving wxAnyStrPtr don't compile because of ambiguity between
-// built-in overloads of these operators for (bool, bool/char*/wchar_t*)
-inline bool operator||(const wxAnyStrPtr& p, bool v) { return (bool)p || v; }
-inline bool operator||(bool v, const wxAnyStrPtr& p) { return v || (bool)p; }
-inline bool operator&&(const wxAnyStrPtr& p, bool v) { return (bool)p && v; }
-inline bool operator&&(bool v, const wxAnyStrPtr& p) { return v && (bool)p; }
-
 #endif // _WX_ANYSTR_H_