X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28f0592cd9b1cbf0cc8f58c37bbe788629fac373..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/meta/movable.h

diff --git a/include/wx/meta/movable.h b/include/wx/meta/movable.h
index cb207abc39..f8624d1fb9 100644
--- a/include/wx/meta/movable.h
+++ b/include/wx/meta/movable.h
@@ -14,6 +14,17 @@
 #include "wx/defs.h"
 #include "wx/string.h" // for wxIsMovable<wxString> specialization
 
+// This macro declares something called "value" inside a class declaration.
+//
+// It has to be used because VC6 doesn't handle initialization of the static
+// variables in the class declaration itself while BCC5.82 doesn't understand
+// enums (it compiles the template fine but can't use it later)
+#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
+    #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) enum { value = val }
+#else
+    #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) static const bool value = val
+#endif
+
 // Helper to decide if an object of type T is "movable", i.e. if it can be
 // copied to another memory location using memmove() or realloc() C functions.
 // C++ only gurantees that POD types (including primitive types) are
@@ -21,8 +32,7 @@
 template<typename T>
 struct wxIsMovable
 {
-    // NB: enum, because VC6 can't handle "static const bool value = true;"
-    enum { value = false };
+    wxDEFINE_TEMPLATE_BOOL_VALUE(false);
 };
 
 // Macro to add wxIsMovable<T> specialization for given type that marks it
@@ -30,7 +40,7 @@ struct wxIsMovable
 #define WX_DECLARE_TYPE_MOVABLE(type)                       \
     template<> struct wxIsMovable<type>                     \
     {                                                       \
-        enum { value = true };                              \
+        wxDEFINE_TEMPLATE_BOOL_VALUE(true);                 \
     };
 
 WX_DECLARE_TYPE_MOVABLE(bool)
@@ -56,30 +66,31 @@ WX_DECLARE_TYPE_MOVABLE(wxULongLong_t)
 // Visual C++ 6.0 can't compile partial template specializations and as this is
 // only an optimization, we can live with pointers not being recognized as
 // movable types under VC6
-#ifndef __VISUALC6__
+#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
 
 // pointers are movable:
 template<typename T>
 struct wxIsMovable<T*>
 {
-    enum { value = true };
+    static const bool value = true;
 };
+
 template<typename T>
 struct wxIsMovable<const T*>
 {
-    enum { value = true };
+    static const bool value = true;
 };
 
-#endif // !__VISUALC6__
+#endif // !VC++ < 7
 
 // Our implementation of wxString is written in such way that it's safe to move
-// it around. OTOH, we don't know anything about std::string.
+// it around (unless position cache is used which unfortunately breaks this).
+// OTOH, we don't know anything about std::string.
 // (NB: we don't put this into string.h and choose to include wx/string.h from
 // here instead so that rarely-used wxIsMovable<T> code isn't included by
 // everything)
-#if !wxUSE_STL
+#if !wxUSE_STL && !wxUSE_STRING_POS_CACHE
 WX_DECLARE_TYPE_MOVABLE(wxString)
 #endif
 
-
 #endif // _WX_META_MOVABLE_H_