summaryrefslogtreecommitdiff
path: root/sax/source/fastparser
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 09:21:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 11:00:51 +0100
commiteaf2c278888ebca0ac99055ee34df6f011da3596 (patch)
tree3177ca36a5eeac09b791ded9fc55d2d82e52c9cd /sax/source/fastparser
parent498cb0b3a372ce1ec0e66640eb0badddff3f2e90 (diff)
boost->std
Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a
Diffstat (limited to 'sax/source/fastparser')
-rw-r--r--sax/source/fastparser/fastparser.cxx22
1 files changed, 10 insertions, 12 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 04ec93133225..86cc85892602 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -38,13 +38,11 @@
#include <sal/log.hxx>
#include <salhelper/thread.hxx>
-#include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <queue>
+#include <memory>
#include <stack>
#include <unordered_map>
#include <vector>
-#include <queue>
#include <cassert>
#include <cstring>
#include <libxml/parser.h>
@@ -52,7 +50,7 @@
// Inverse of libxml's BAD_CAST.
#define XML_CAST( str ) reinterpret_cast< const sal_Char* >( str )
-using namespace ::std;
+using namespace std;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
@@ -69,10 +67,10 @@ class FastLocatorImpl;
struct NamespaceDefine;
struct Entity;
-typedef ::boost::shared_ptr< NamespaceDefine > NamespaceDefineRef;
+typedef std::shared_ptr< NamespaceDefine > NamespaceDefineRef;
typedef std::unordered_map< OUString, sal_Int32,
- OUStringHash, ::std::equal_to< OUString > > NamespaceMap;
+ OUStringHash, std::equal_to< OUString > > NamespaceMap;
typedef std::vector<Event> EventList;
@@ -176,14 +174,14 @@ struct Entity : public ParserData
void throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumentLocator,
bool mbDuringParse );
- ::std::stack< NameWithToken > maNamespaceStack;
+ std::stack< NameWithToken > maNamespaceStack;
/* Context for main thread consuming events.
* startElement() stores the data, which characters() and endElement() uses
*/
- ::std::stack< SaxContext> maContextStack;
+ std::stack< SaxContext> maContextStack;
// Determines which elements of maNamespaceDefines are valid in current context
- ::std::stack< sal_uInt32 > maNamespaceCount;
- ::std::vector< NamespaceDefineRef > maNamespaceDefines;
+ std::stack< sal_uInt32 > maNamespaceCount;
+ std::vector< NamespaceDefineRef > maNamespaceDefines;
explicit Entity( const ParserData& rData );
Entity( const Entity& rEntity );
@@ -260,7 +258,7 @@ private:
ParserData maData; /// Cached parser configuration for next call of parseStream().
Entity *mpTop; /// std::stack::top() is amazingly slow => cache this.
- ::std::stack< Entity > maEntities; /// Entity stack for each call of parseStream().
+ std::stack< Entity > maEntities; /// Entity stack for each call of parseStream().
OUString pendingCharacters; /// Data from characters() callback that needs to be sent.
};