From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 19 Jan 2011 23:47:09 +0000 (+0000)
Subject: Work around wxNumValidator compilation problems with MSVC 6.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6496afbab8fa5973626d92d5af0a26bd1a2db6b2

Work around wxNumValidator compilation problems with MSVC 6.

Surprisingly, MSVC 6 seems to be able to compile most of the code but chokes
on a wxCOMPILE_TIME_ASSERT involving an inherited typedef. As this assert is
not critical, simply disable it for this compiler.

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

diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 428fe7ff8a..5971e612a6 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -135,11 +135,17 @@ public:
 
     typedef typename BaseValidator::LongestValueType LongestValueType;
 
+    // FIXME-VC6: This compiler fails to compile the assert below with a
+    // nonsensical error C2248: "'LongestValueType' : cannot access protected
+    // typedef declared in class 'wxIntegerValidatorBase'" so just disable the
+    // check for it.
+#ifndef __VISUALC6__
     wxCOMPILE_TIME_ASSERT
     (
         sizeof(ValueType) <= sizeof(LongestValueType),
         UnsupportedType
     );
+#endif // __VISUALC6__
 
     void SetMin(ValueType min)
     {