diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-25 21:47:33 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-04 11:34:36 +0200 |
commit | a783cea3300ca854fc988e7c47bec088fb457444 (patch) | |
tree | 2d37c2bbb9a3a1d2e0470a9ca8f3e54be7ce2d18 /ucb/source/ucp/webdav/ContentProperties.hxx | |
parent | e5884f866f08c6df1dd8884060a4e7b69a510a93 (diff) |
Build webdav based on serf if neon is disabled.
(cherry picked from commit dcae0509135c2067635ae3cf84b05dc9fb3d2d02)
Conflicts:
Repository.mk
postprocess/CustomTarget_registry.mk
ucb/Module_ucb.mk
ucb/source/ucp/webdav/webdavservices.cxx
Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281
Diffstat (limited to 'ucb/source/ucp/webdav/ContentProperties.hxx')
-rw-r--r-- | ucb/source/ucp/webdav/ContentProperties.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 2e7054be0646..1776306357c2 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -24,7 +24,7 @@ #include <memory> #include <vector> -#include <unordered_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -82,7 +82,7 @@ public: }; -typedef std::unordered_map +typedef boost::unordered_map < OUString, PropertyValue, |