More warning and error fixes (work in progress with Tinderbox).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -92,8 +92,8 @@ void spInterFileContext::InsertBookmarkSorted( BookmarkListT& lst, spBookmark& m | ||||
|     lst.push_back( mark ); | ||||
| } | ||||
|  | ||||
| void spInterFileContext::DoAppendSourceFragment( string& source, | ||||
|                                                  string& result, | ||||
| void spInterFileContext::DoAppendSourceFragment( wxString& source, | ||||
|                                                  wxString& result, | ||||
|                                                  size_t  pos, size_t len ) | ||||
| { | ||||
|     mFiltered.erase( mFiltered.begin(), mFiltered.end() ); | ||||
| @@ -132,8 +132,8 @@ void spInterFileContext::DoAppendSourceFragment( string& source, | ||||
| } | ||||
|  | ||||
| void spInterFileContext::GenerateContextBody( spContext& ctx, | ||||
|                                               string&    source, | ||||
|                                               string&    result, | ||||
|                                               wxString&  source, | ||||
|                                               wxString&  result, | ||||
|                                               size_t&    lastSavedPos, | ||||
|                                               size_t&    lastKnownPos ) | ||||
| { | ||||
|   | ||||
| @@ -59,15 +59,16 @@ protected: | ||||
|  | ||||
|     void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark ); | ||||
|  | ||||
|     void DoAppendSourceFragment( string& source, | ||||
|                                  string& result, | ||||
|                                  size_t  pos, size_t len ); | ||||
|     void DoAppendSourceFragment( wxString& source, | ||||
|                                  wxString& result, | ||||
|                                  size_t    pos, | ||||
|                                  size_t len ); | ||||
|  | ||||
|     void GenerateContextBody( spContext& ctx, | ||||
|                               string&    source, | ||||
|                               string&    result, | ||||
|                               size_t& lastSavedPos, | ||||
|                               size_t& lastKnownPos ); | ||||
|                               wxString&  source, | ||||
|                               wxString&  result, | ||||
|                               size_t&    lastSavedPos, | ||||
|                               size_t&    lastKnownPos ); | ||||
|  | ||||
| public: | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user