clang fixes, fixes #12332

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

diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index 388146d5025407d2d43b4c942e8e33f2dc4bd196..ebc8e2bcca1c2b912b32eadfcfb14ee35a26a60e 100644 (file)
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -793,23 +793,6 @@ private:
     const int m_numLines;
 };
 
-// ----------------------------------------------------------------------------
-// private helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// ensure that first is less or equal to second, swapping the values if
-// necessary
-void EnsureFirstLessThanSecond(int& first, int& second)
-{
-    if ( first > second )
-        wxSwap(first, second);
-}
-
-} // anonymous namespace
-
 // ----------------------------------------------------------------------------
 // data structures used for the data type registry
 // ----------------------------------------------------------------------------

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index bdac007cb7e604eac277ca5fd3d537f62942830e..d095ff97b110780f1b69e3d1ff9d2d1cf72334cc 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -880,7 +880,7 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
         { return implW(nptr, endptr, base); }                                 \
     template<typename T>                                                      \
     inline rettype name(const wxScopedCharTypeBuffer<T>& nptr, T **endptr, int base)\
-        { return name(nptr.data(), endptr); }                                 \
+        { wxUnusedVar(base); return name(nptr.data(), endptr); }              \
     template<typename T>                                                      \
     inline rettype name(const wxString& nptr, T endptr, int base)             \
     {                                                                         \

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 45d61abdc866d14c0f343f45a6aa9a7626ff4039..5701bbef22aedad0444d7643887b36a0ea0cbd95 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -156,6 +156,23 @@ wxDEFINE_EVENT( wxEVT_GRID_EDITOR_SHOWN, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent );
 
+// ----------------------------------------------------------------------------
+// private helpers
+// ----------------------------------------------------------------------------
+
+namespace
+{
+    
+    // ensure that first is less or equal to second, swapping the values if
+    // necessary
+    void EnsureFirstLessThanSecond(int& first, int& second)
+    {
+        if ( first > second )
+            wxSwap(first, second);
+    }
+    
+} // anonymous namespace
+
 // ============================================================================
 // implementation
 // ============================================================================