From c88d34ee97f85dd814eae70c9e6ff373096be522 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 15 Jul 2008 14:15:42 +0000 Subject: [PATCH] Renamed Archive::ArchiveStatus to ReaderWriter::ArchiveStatus --- include/osgDB/Archive | 4 ++-- src/osgDB/Archive.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osgDB/Archive b/include/osgDB/Archive index 43cfcd9ff..3f67461f4 100644 --- a/include/osgDB/Archive +++ b/include/osgDB/Archive @@ -65,10 +65,10 @@ class OSGDB_EXPORT Archive : public ReaderWriter }; /** Open an archive for reading or writing.*/ -OSGDB_EXPORT Archive* openArchive(const std::string& filename, Archive::ArchiveStatus status, unsigned int indexBlockSizeHint=4096); +OSGDB_EXPORT Archive* openArchive(const std::string& filename, ReaderWriter::ArchiveStatus status, unsigned int indexBlockSizeHint=4096); /** Open an archive for reading or writing.*/ -OSGDB_EXPORT Archive* openArchive(const std::string& filename, Archive::ArchiveStatus status, unsigned int indexBlockSizeHint,ReaderWriter::Options* options); +OSGDB_EXPORT Archive* openArchive(const std::string& filename, ReaderWriter::ArchiveStatus status, unsigned int indexBlockSizeHint,ReaderWriter::Options* options); } #endif // OSGDB_ARCHIVE diff --git a/src/osgDB/Archive.cpp b/src/osgDB/Archive.cpp index 8fd76c516..1c8fdeb36 100644 --- a/src/osgDB/Archive.cpp +++ b/src/osgDB/Archive.cpp @@ -22,12 +22,12 @@ using namespace osgDB; -osgDB::Archive* osgDB::openArchive(const std::string& filename, Archive::ArchiveStatus status, unsigned int indexBlockSizeHint) +osgDB::Archive* osgDB::openArchive(const std::string& filename, ReaderWriter::ArchiveStatus status, unsigned int indexBlockSizeHint) { return openArchive(filename, status, indexBlockSizeHint, Registry::instance()->getOptions()); } -osgDB::Archive* osgDB::openArchive(const std::string& filename, Archive::ArchiveStatus status, unsigned int indexBlockSizeHint,ReaderWriter::Options* options) +osgDB::Archive* osgDB::openArchive(const std::string& filename, ReaderWriter::ArchiveStatus status, unsigned int indexBlockSizeHint,ReaderWriter::Options* options) { // ensure archive extension is in the registry list std::string::size_type dot = filename.find_last_of('.');