From db2c04684d8fabf332db5e1c237f53408983fe3c Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 27 Jan 2011 18:35:01 +0000
Subject: [PATCH] clang fixes, fixes #12332

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/private/grid.h | 17 -----------------
 include/wx/wxcrt.h                |  2 +-
 src/generic/grid.cpp              | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index 388146d502..ebc8e2bcca 100644
--- 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 bdac007cb7..d095ff97b1 100644
--- 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 45d61abdc8..5701bbef22 100644
--- 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
 // ============================================================================
-- 
2.45.2