Allow specifying non default port for wxFTP connections.

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

diff --git a/include/wx/any.h b/include/wx/any.h
index 2a1bf7142a6ea675a0300f2ef0a3fd03043ec0be..366f4bc5e3c4ceecac4b8be47b8119e46ff0aeb6 100644 (file)
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -17,7 +17,7 @@
 #if wxUSE_ANY
 
 #include "wx/string.h"
-#include "wx/meta/movable.h"
+#include "wx/meta/pod.h"
 #include "wx/meta/if.h"
 #include "wx/typeinfo.h"
 
@@ -112,7 +112,7 @@ public:
     */
     // FIXME-VC6: remove this hack when VC6 is no longer supported
     template <typename T>
-    bool CheckType(T* reserved = NULL);
+    bool CheckType(T* reserved = NULL) const;
 private:
 };
 
@@ -193,7 +193,7 @@ namespace wxPrivate
 {
 
 template<typename T>
-class wxAnyValueTypeOpsMovable
+class wxAnyValueTypeOpsPOD
 {
 public:
     static void DeleteValue(wxAnyValueBuffer& buf)
@@ -270,9 +270,9 @@ public:
 template<typename T>
 class wxAnyValueTypeImplBase : public wxAnyValueType
 {
-    typedef typename wxIf< wxIsMovable<T>::value &&
+    typedef typename wxIf< wxIsPod<T>::value &&
                                 sizeof(T) <= WX_ANY_VALUE_BUFFER_SIZE,
-                           wxPrivate::wxAnyValueTypeOpsMovable<T>,
+                           wxPrivate::wxAnyValueTypeOpsPOD<T>,
                            wxPrivate::wxAnyValueTypeOpsGeneric<T> >::value
             Ops;
 
@@ -772,7 +772,7 @@ public:
     */
     // FIXME-VC6: remove this hack when VC6 is no longer supported
     template <typename T>
-    bool CheckType(T* = NULL)
+    bool CheckType(T* = NULL) const
     {
         return m_type->CheckType<T>();
     }
@@ -1054,7 +1054,7 @@ private:
 
 
 template<typename T>
-inline bool wxAnyValueType::CheckType(T* reserved)
+inline bool wxAnyValueType::CheckType(T* reserved) const
 {
     wxUnusedVar(reserved);
     return wxAnyValueTypeImpl<T>::IsSameClass(this);