aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/compression/lzma/lzma.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/compression/lzma/lzma.cpp
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency, eg make_u32bit becomes make_uint32. The old typedefs remain for now since probably lots of application code uses them.
Diffstat (limited to 'src/lib/compression/lzma/lzma.cpp')
-rw-r--r--src/lib/compression/lzma/lzma.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/compression/lzma/lzma.cpp b/src/lib/compression/lzma/lzma.cpp
index 3831ef68c..44af1ee67 100644
--- a/src/lib/compression/lzma/lzma.cpp
+++ b/src/lib/compression/lzma/lzma.cpp
@@ -17,7 +17,7 @@ namespace Botan {
namespace {
-class LZMA_Stream : public Zlib_Style_Stream<lzma_stream, byte>
+class LZMA_Stream : public Zlib_Style_Stream<lzma_stream, uint8_t>
{
public:
LZMA_Stream()
@@ -35,7 +35,7 @@ class LZMA_Stream : public Zlib_Style_Stream<lzma_stream, byte>
delete streamp()->allocator;
}
- bool run(u32bit flags) override
+ bool run(uint32_t flags) override
{
lzma_ret rc = ::lzma_code(streamp(), static_cast<lzma_action>(flags));
@@ -47,9 +47,9 @@ class LZMA_Stream : public Zlib_Style_Stream<lzma_stream, byte>
return (rc == LZMA_STREAM_END);
}
- u32bit run_flag() const override { return LZMA_RUN; }
- u32bit flush_flag() const override { return LZMA_FULL_FLUSH; }
- u32bit finish_flag() const override { return LZMA_FINISH; }
+ uint32_t run_flag() const override { return LZMA_RUN; }
+ uint32_t flush_flag() const override { return LZMA_FULL_FLUSH; }
+ uint32_t finish_flag() const override { return LZMA_FINISH; }
};
class LZMA_Compression_Stream : public LZMA_Stream