solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Define wxArchiveIterator in all builds, not just STL one

Browse source 
Doing this doesn't introduce any backwards compatibility problems, so do
it always, and not only when wxUSE_STL==1.
This commit is contained in:
Vadim Zeitlin 2023-04-08 23:03:24 +01:00
parent d0e892ac09
commit e9527ee5a2
5 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/wx/archive.h
View file

@ -164,7 +164,6 @@ private:
// An input iterator that can be used to transfer an archive's catalog to // An input iterator that can be used to transfer an archive's catalog to
// a container. // a container.
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
#include <iterator> #include <iterator>
#include <utility> #include <utility>
@ -296,8 +295,6 @@ typedef wxArchiveIterator<wxArchiveInputStream> wxArchiveIter;
typedef wxArchiveIterator<wxArchiveInputStream, typedef wxArchiveIterator<wxArchiveInputStream,
std::pair<wxString, wxArchiveEntry*> > wxArchivePairIter; std::pair<wxString, wxArchiveEntry*> > wxArchivePairIter;
#endif // wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// wxArchiveClassFactory // wxArchiveClassFactory
@ -314,10 +311,8 @@ public:
typedef wxArchiveInputStream instream_type; typedef wxArchiveInputStream instream_type;
typedef wxArchiveOutputStream outstream_type; typedef wxArchiveOutputStream outstream_type;
typedef wxArchiveNotifier notifier_type; typedef wxArchiveNotifier notifier_type;
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
typedef wxArchiveIter iter_type; typedef wxArchiveIter iter_type;
typedef wxArchivePairIter pairiter_type; typedef wxArchivePairIter pairiter_type;
#endif
virtual ~wxArchiveClassFactory() { } virtual ~wxArchiveClassFactory() { }

4
include/wx/tarstrm.h
View file

@ -289,11 +289,9 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Iterators // Iterators
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
typedef wxArchiveIterator<wxTarInputStream> wxTarIter; typedef wxArchiveIterator<wxTarInputStream> wxTarIter;
typedef wxArchiveIterator<wxTarInputStream, typedef wxArchiveIterator<wxTarInputStream,
std::pair<wxString, wxTarEntry*> > wxTarPairIter; std::pair<wxString, wxTarEntry*> > wxTarPairIter;
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -306,10 +304,8 @@ public:
typedef wxTarInputStream instream_type; typedef wxTarInputStream instream_type;
typedef wxTarOutputStream outstream_type; typedef wxTarOutputStream outstream_type;
typedef wxTarNotifier notifier_type; typedef wxTarNotifier notifier_type;
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
typedef wxTarIter iter_type; typedef wxTarIter iter_type;
typedef wxTarPairIter pairiter_type; typedef wxTarPairIter pairiter_type;
#endif
wxTarClassFactory(); wxTarClassFactory();

4
include/wx/zipstrm.h
View file

@ -458,11 +458,9 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Iterators // Iterators
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
typedef wxArchiveIterator<wxZipInputStream> wxZipIter; typedef wxArchiveIterator<wxZipInputStream> wxZipIter;
typedef wxArchiveIterator<wxZipInputStream, typedef wxArchiveIterator<wxZipInputStream,
std::pair<wxString, wxZipEntry*> > wxZipPairIter; std::pair<wxString, wxZipEntry*> > wxZipPairIter;
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -475,10 +473,8 @@ public:
typedef wxZipInputStream instream_type; typedef wxZipInputStream instream_type;
typedef wxZipOutputStream outstream_type; typedef wxZipOutputStream outstream_type;
typedef wxZipNotifier notifier_type; typedef wxZipNotifier notifier_type;
#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
typedef wxZipIter iter_type; typedef wxZipIter iter_type;
typedef wxZipPairIter pairiter_type; typedef wxZipPairIter pairiter_type;
#endif
wxZipClassFactory(); wxZipClassFactory();

4
interface/wx/archive.h
View file

@ -497,9 +497,7 @@ public:
@class wxArchiveIterator @class wxArchiveIterator
An input iterator template class that can be used to transfer an archive's An input iterator template class that can be used to transfer an archive's
catalogue to a container. It is only available if wxUSE_STL is set to 1 catalogue to a container.
in setup.h, and the uses for it outlined below require a compiler which
supports member templates.
@code @code
template<class Arc, class T = typename Arc::entry_type*> template<class Arc, class T = typename Arc::entry_type*>

2
tests/archive/archivetest.h
View file

@ -9,8 +9,6 @@
#ifndef WX_ARCHIVETEST_INCLUDED #ifndef WX_ARCHIVETEST_INCLUDED
#define WX_ARCHIVETEST_INCLUDED 1 #define WX_ARCHIVETEST_INCLUDED 1
#define WX_TEST_ARCHIVE_ITERATOR
#include "wx/archive.h" #include "wx/archive.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"