summaryrefslogtreecommitdiff
path: root/codemaker/source/cppumaker/includes.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-17 16:56:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-17 16:59:53 +0200
commit543158edba6678d3d76eee983a9d4edd2a422fee (patch)
tree458133435b06afd5b50379c058a0f886fe9e82c1 /codemaker/source/cppumaker/includes.cxx
parent6e78fd18c9ca2d70af93cad321f55f3d72172742 (diff)
Require XComponentContext.getServiceManager to throw instead of returning null
This is such a fatal error that there is probably no point in trying to handle it, so allow to simplify client code by removing the requirement to check for a null return value. Simplified some client code accordingly (modules configmgr and ure, and the code generated by cppumaker and javamaker). Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
Diffstat (limited to 'codemaker/source/cppumaker/includes.cxx')
-rw-r--r--codemaker/source/cppumaker/includes.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index b6c9a63f4734..9411312eca93 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -40,7 +40,8 @@ Includes::Includes(
TypeManager const & manager, codemaker::Dependencies const & dependencies,
bool hpp):
m_manager(manager), m_map(dependencies.getMap()), m_hpp(hpp),
- m_includeAny(dependencies.hasAnyDependency()), m_includeReference(false),
+ m_includeCassert(false), m_includeAny(dependencies.hasAnyDependency()),
+ m_includeReference(false),
m_includeSequence(dependencies.hasSequenceDependency()),
m_includeType(dependencies.hasTypeDependency()),
m_includeCppuMacrosHxx(false), m_includeCppuUnotypeHxx(false),
@@ -155,6 +156,9 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
}
}
out << "#include \"sal/config.h\"\n";
+ if (m_includeCassert) {
+ out << "\n#include <cassert>\n";
+ }
if (companionHdl) {
out << "\n";
dumpInclude(out, *companionHdl, false);