FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Untar namespacing.

Browse Source
This commit is contained in:
James Turner
2016-06-14 15:13:58 +01:00
parent fb8b60b6fe
commit f824cf85a4
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/io/untar.cxx
+3 -8
View File
@@ -34,12 +34,9 @@
namespace simgear namespace simgear
{ {
namespace pkg const int ZLIB_DECOMPRESS_BUFFER_SIZE = 32 * 1024;
{ const int ZLIB_INFLATE_WINDOW_BITS = MAX_WBITS;
const int ZLIB_DECODE_GZIP_HEADER = 16;
const int ZLIB_DECOMPRESS_BUFFER_SIZE = 32 * 1024;
const int ZLIB_INFLATE_WINDOW_BITS = MAX_WBITS;
const int ZLIB_DECODE_GZIP_HEADER = 16;
/* tar Header Block, from POSIX 1003.1-1990. */ /* tar Header Block, from POSIX 1003.1-1990. */
@@ -344,6 +341,4 @@ bool TarExtractor::hasError() const
return (d->state >= TarExtractorPrivate::ERROR_STATE); return (d->state >= TarExtractorPrivate::ERROR_STATE);
} }
} // of pkg
} // of simgear } // of simgear
simgear/io/untar.hxx
+3 -8
View File
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// //
#ifndef SG_PKG_UNTAR_HXX #ifndef SG_IO_UNTAR_HXX
#define SG_PKG_UNTAR_HXX #define SG_IO_UNTAR_HXX
#include <memory> #include <memory>
@@ -25,9 +25,6 @@
namespace simgear namespace simgear
{ {
namespace pkg
{
class TarExtractorPrivate; class TarExtractorPrivate;
class TarExtractor class TarExtractor
@@ -46,8 +43,6 @@ private:
std::auto_ptr<TarExtractorPrivate> d; std::auto_ptr<TarExtractorPrivate> d;
}; };
} // of namespace pkg
} // of namespace simgear } // of namespace simgear
#endif #endif // of SG_IO_UNTAR_HXX