allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576)

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 91871da380e1762fe05e7ca2d6ce2143cf6f920d..ff50f65f4bc5b899eea6854d897bd05cd50aedef 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -43,8 +43,6 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 #if wxUSE_CONFIG
 
 
 #if wxUSE_CONFIG
 

-#include "wx/string.h"
-

 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))
 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))


@@ -52,6 +50,15 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 

+// not all compilers can deal with template Read/Write() methods, define this
+// symbol if the template functions are available
+#if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
+    !defined( __VMS ) && \
+    !(defined(__HP_aCC) && defined(__hppa)) && \
+    !defined (__DMC__)
+    #define wxHAS_CONFIG_TEMPLATE_RW
+#endif
+

 // Style flags for constructor style parameter
 enum
 {
 // Style flags for constructor style parameter
 enum
 {


@@ -185,8 +192,7 @@ public:
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 

-  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
-#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
+#ifdef wxHAS_CONFIG_TEMPLATE_RW

   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const
   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const


@@ -209,7 +215,7 @@ public:
       }
       return found;
   }
       }
       return found;
   }

-#endif
+#endif // wxHAS_CONFIG_TEMPLATE_RW

 
   // convenience functions returning directly the value 
   wxString Read(const wxString& key,
 
   // convenience functions returning directly the value 
   wxString Read(const wxString& key,


@@ -430,7 +436,7 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 

-  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
+  wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger);

 };
 
 
 };