Don't define wxArrayPGProperty as std::vector in STL build.

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 321d348ab543d4aa06e17c0723c627b26fb25929..110afc760ca4455691e58adaa645037aa6ad4039 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -137,7 +137,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split
-                if ( result.empty() || result.Last() != _T('\r') )
+                if ( result.empty() || result.Last() != wxT('\r') )
                 {
                     // ignore the stray '\n'
                     eol = NULL;
@@ -210,6 +210,7 @@ void wxProtocol::LogResponse(const wxString& str)
 
 void wxProtocolLog::DoLogString(const wxString& str)
 {
+    wxUnusedVar(str); // unused if wxLogTrace() is disabled
     wxLogTrace(m_traceMask, "%s", str);
 }