Fix uninitialized variable warning in wxMSW wxFileSystemWatcher code.

[wxWidgets.git] / src / common / markupparser.cpp

diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp
index 8320e35eca8f2784dcbaf4bc710934aebd52dbf2..c0580e242fe770185d0abb4e3480cc4a4e37a12f 100644 (file)
--- a/src/common/markupparser.cpp
+++ b/src/common/markupparser.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16

-// RCS-ID:      $Id: $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,8 +23,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MARKUP
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#endif // WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/private/markupparser.h"
 
 
 #include "wx/private/markupparser.h"
 


@@ -277,10 +280,15 @@ bool wxMarkupParser::Parse(const wxString& text)
                         current.clear();
                     }
 
                         current.clear();
                     }
 

+                    // This variable is used only in the debugging messages
+                    // and doesn't need to be defined if they're not compiled
+                    // at all (it actually would result in unused variable
+                    // messages in this case).
+#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS)

                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();
                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();

-
+#endif

                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {
                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {


@@ -473,3 +481,5 @@ wxString wxMarkupParser::Strip(const wxString& text)
 
     return output.GetText();
 }
 
     return output.GetText();
 }

+
+#endif // wxUSE_MARKUP