Don't use boost in code generated by uno-skeletonmaker
This had originally used a non-standard std::hash_map indb4b02eea5
"INTEGRATION: CWS jsc3 (1.4.2); FILE MERGED", then switched to boost::unordered_map in639825975e
"move sdk repo to boost unordered containters". (And Executable_uno-skeletonmaker doesn't need boost during the build at all, so clean that up here, too.) Change-Id: I80661d70a54ec5d69b8f124c12d5cb0d6f369887 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161147 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
parent
f557e22a67
commit
fdc1a42db0
2 changed files with 5 additions and 7 deletions
|
@ -9,8 +9,6 @@
|
|||
|
||||
$(eval $(call gb_Executable_Executable,uno-skeletonmaker))
|
||||
|
||||
$(eval $(call gb_Executable_use_external,uno-skeletonmaker,boost_headers))
|
||||
|
||||
$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
|
||||
-I$(SRCDIR)/unodevtools/inc \
|
||||
$$(INCLUDE) \
|
||||
|
|
|
@ -689,10 +689,10 @@ static OString generateClassDefinition(std::ostream& o,
|
|||
" virtual ~" << classname << "() {}\n\n";
|
||||
|
||||
if (options.componenttype == 2) {
|
||||
o << " typedef boost::unordered_map< ::sal_Int32, OUString, "
|
||||
"boost::hash<::sal_Int32> > ParamMap;\n"
|
||||
" typedef boost::unordered_map< OUString, ParamMap, "
|
||||
"OUStringHash > FunctionMap;\n\n"
|
||||
o << " typedef std::map< ::sal_Int32, OUString "
|
||||
"> ParamMap;\n"
|
||||
" typedef std::map< OUString, ParamMap "
|
||||
"> FunctionMap;\n\n"
|
||||
" OUString SAL_CALL getAddinProperty(const OUString & "
|
||||
"funcName, const OUString & paramName, const char * propName) "
|
||||
"throw (css::uno::RuntimeException);\n\n";
|
||||
|
@ -1146,7 +1146,7 @@ void generateCalcAddin(ProgramOptions const & options,
|
|||
"#include \"com/sun/star/container/XNameAccess.hpp\"\n"
|
||||
"#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"\n\n"
|
||||
"#include \"rtl/ustrbuf.hxx\"\n\n"
|
||||
"#include <boost/unordered_map.hpp>\n"
|
||||
"#include <map>\n"
|
||||
"#include <set>\n";
|
||||
|
||||
// namespace
|
||||
|
|
Loading…
Reference in a new issue