diff options
| author | David Tardon <dtardon@redhat.com> | 2016-02-21 10:17:25 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-02-21 15:39:28 +0100 |
| commit | ab5ca68deb6404d20d932d25d8f34c0201ae2668 (patch) | |
| tree | ce56f59bfc0bf4b709d295df1bdcb000c6353af2 /src | |
| parent | 8f4eec7dae72af1b98c596c58ae480ad955e99d3 (diff) | |
make boost dep unconditional
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/WinText602Parser.h | 4 | ||||
| -rw-r--r-- | src/lib/libsw602_utils.h | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/lib/WinText602Parser.h b/src/lib/WinText602Parser.h index 74e0447..ef77702 100644 --- a/src/lib/WinText602Parser.h +++ b/src/lib/WinText602Parser.h @@ -10,6 +10,8 @@ #ifndef INCLUDED_WINTEXT602PARSER_H #define INCLUDED_WINTEXT602PARSER_H +#include <boost/shared_ptr.hpp> + #include <librevenge/librevenge.h> #include "libsw602_utils.h" @@ -82,7 +84,7 @@ private: librevenge::RVNGInputStream *m_input; librevenge::RVNGTextInterface *m_document; - shared_ptr<WinText602SectionMap> m_sectionMap; + boost::shared_ptr<WinText602SectionMap> m_sectionMap; }; } // namespace libsw602 diff --git a/src/lib/libsw602_utils.h b/src/lib/libsw602_utils.h index f97db9c..1decfac 100644 --- a/src/lib/libsw602_utils.h +++ b/src/lib/libsw602_utils.h @@ -51,16 +51,7 @@ typedef __int64 int64_t; #endif -#if defined(SHAREDPTR_TR1) -#include <tr1/memory> -using std::tr1::shared_ptr; -#elif defined(SHAREDPTR_STD) -#include <memory> -using std::shared_ptr; -#else #include <boost/shared_ptr.hpp> -using boost::shared_ptr; -#endif /** an noop deleter used to transform a librevenge pointer in a false shared_ptr */ template <class T> @@ -69,7 +60,7 @@ struct SW602_shared_ptr_noop_deleter void operator()(T *) {} }; -typedef shared_ptr<librevenge::RVNGInputStream> RVNGInputStreamPtr; +typedef boost::shared_ptr<librevenge::RVNGInputStream> RVNGInputStreamPtr; // debug message includes source file and line number //#define VERBOSE_DEBUG 1 |