summaryrefslogtreecommitdiff
path: root/zinflate.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2015-07-30 11:15:51 -0400
committerJeffrey Walton <noloader@gmail.com>2015-07-30 11:15:51 -0400
commit60291122ae2fe6bd83a40a470e951f12f642fc73 (patch)
tree4549cb8b0902c2531bb5b616931fae3e819bdf6f /zinflate.cpp
parente5171450e24b1556f53f9d1d200fae89fdc2d97a (diff)
downloadcryptopp-git-60291122ae2fe6bd83a40a470e951f12f642fc73.tar.gz
Cleared "no member named 'unique_ptr' in namespace 'std'" error under C++11 on OS X
Diffstat (limited to 'zinflate.cpp')
-rw-r--r--zinflate.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/zinflate.cpp b/zinflate.cpp
index 5ba63252..0a2ec2ab 100644
--- a/zinflate.cpp
+++ b/zinflate.cpp
@@ -587,12 +587,13 @@ struct NewFixedLiteralDecoder
{
HuffmanDecoder * operator()() const
{
+ using CryptoPP::auto_ptr;
unsigned int codeLengths[288];
std::fill(codeLengths + 0, codeLengths + 144, 8);
std::fill(codeLengths + 144, codeLengths + 256, 9);
std::fill(codeLengths + 256, codeLengths + 280, 7);
std::fill(codeLengths + 280, codeLengths + 288, 8);
- std::auto_ptr<HuffmanDecoder> pDecoder(new HuffmanDecoder);
+ auto_ptr<HuffmanDecoder> pDecoder(new HuffmanDecoder);
pDecoder->Initialize(codeLengths, 288);
return pDecoder.release();
}
@@ -602,13 +603,10 @@ struct NewFixedDistanceDecoder
{
HuffmanDecoder * operator()() const
{
+ using CryptoPP::auto_ptr;
unsigned int codeLengths[32];
std::fill(codeLengths + 0, codeLengths + 32, 5U);
-#if defined(CRYPTOPP_CXX11)
- std::unique_ptr<HuffmanDecoder> pDecoder(new HuffmanDecoder);
-#else
- std::auto_ptr<HuffmanDecoder> pDecoder(new HuffmanDecoder);
-#endif
+ auto_ptr<HuffmanDecoder> pDecoder(new HuffmanDecoder);
pDecoder->Initialize(codeLengths, 32);
return pDecoder.release();
}