diff options
author | David Tardon <dtardon@redhat.com> | 2016-03-27 18:28:21 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-03-27 18:28:21 +0200 |
commit | d24b4ebd6085c4bb78a9fd2fa05f317104569f0a (patch) | |
tree | d14e3b83f11e3affd3b961aa6ce53b0f85d6c8cc | |
parent | 6a650684b056dab89c44fe25848eb12fb8fbe9b2 (diff) |
move macros up
-rw-r--r-- | src/lib/libsw602_utils.h | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/lib/libsw602_utils.h b/src/lib/libsw602_utils.h index 5ffb223..6822902 100644 --- a/src/lib/libsw602_utils.h +++ b/src/lib/libsw602_utils.h @@ -19,27 +19,6 @@ #include <librevenge-stream/librevenge-stream.h> #include <librevenge/librevenge.h> -namespace libsw602 -{ - -using boost::uint8_t; -using boost::int8_t; -using boost::uint16_t; -using boost::int16_t; -using boost::uint32_t; -using boost::int32_t; -using boost::uint64_t; -using boost::int64_t; - -/** an noop deleter used to transform a librevenge pointer in a false shared_ptr */ -template <class T> -struct SW602_shared_ptr_noop_deleter -{ - void operator()(T *) {} -}; - -} - // debug message includes source file and line number //#define VERBOSE_DEBUG 1 @@ -62,6 +41,22 @@ struct SW602_shared_ptr_noop_deleter namespace libsw602 { +using boost::uint8_t; +using boost::int8_t; +using boost::uint16_t; +using boost::int16_t; +using boost::uint32_t; +using boost::int32_t; +using boost::uint64_t; +using boost::int64_t; + +/** an noop deleter used to transform a librevenge pointer in a false shared_ptr */ +template <class T> +struct SW602_shared_ptr_noop_deleter +{ + void operator()(T *) {} +}; + uint8_t readU8(librevenge::RVNGInputStream &input, bool = false); uint16_t readU16(librevenge::RVNGInputStream &input, bool bigEndian=false); uint32_t readU32(librevenge::RVNGInputStream &input, bool bigEndian=false); |