From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Feb 2010 22:47:21 +0000 (+0000)
Subject: Remove wxHAS_NAMESPACES and gcc 2.95 checks.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/011ad05168e653e686c711ab6356d18b984405c8?ds=inline

Remove wxHAS_NAMESPACES and gcc 2.95 checks.

We use namespaces elsewhere without any checks now so it doesn't make sense to
keep checking for them here.

We also don't support g++ 2.95 since ages so no need to check for it neither.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h
index da056e08db..a68c9896d8 100644
--- a/include/wx/scopeguard.h
+++ b/include/wx/scopeguard.h
@@ -51,17 +51,8 @@
 
 #else
 
-// namespace support was first implemented in gcc-2.95,
-// so avoid using it for older versions.
-#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
-
-#define wxHAS_NAMESPACES
-
 namespace wxPrivate
 {
-#else
-#define wxPrivate
-#endif
     // in the original implementation this was a member template function of
     // ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
     // support member templates and so we must make it global
@@ -84,9 +75,7 @@ namespace wxPrivate
     void Use(const T& WXUNUSED(t))
     {
     }
-#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
 } // namespace wxPrivate
-#endif
 
 #define wxPrivateOnScopeExit(n) wxPrivate::OnScopeExit(n)
 #define wxPrivateUse(n) wxPrivate::Use(n)
@@ -397,8 +386,6 @@ wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3)
 //                   setting a variable to some value on block exit
 // ----------------------------------------------------------------------------
 
-#ifdef wxHAS_NAMESPACES
-
 namespace wxPrivate
 {
 
@@ -469,8 +456,6 @@ wxPrivate::VariableNullerImpl<T> wxMakeVarNuller(T& var)
     return wxPrivate::VariableNullerImpl<T>(var);
 }
 
-#endif // wxHAS_NAMESPACES
-
 // ============================================================================
 // macros for declaring unnamed scoped guards (which can't be dismissed)
 // ============================================================================