Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

topic/alignment #405

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.version export-subst
.gitattributes export-ignore
.gitignore export-ignore
appveyor.yml export-ignore
.travis.yml export-ignore
6 changes: 2 additions & 4 deletions schemas/ComponentTypeSet.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="W3cXmlAttributes.xsd"/>
<xs:include schemaLocation="Parameter.xsd"/>
<xs:complexType name="ComponentType">
<xs:sequence>
<xs:sequence maxOccurs="unbounded">
<xs:group ref="ParameterBlockGroup"/>
</xs:sequence>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:group ref="ParameterBlockGroup"/>
</xs:sequence>
<xs:attributeGroup ref="Nameable"/>
<xs:attribute name="Extends" use="optional"/>
Expand Down
6 changes: 4 additions & 2 deletions utility/posix/DynamicLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ DynamicLibrary::DynamicLibrary(const std::string &path) : _path(osSanitizePathNa
if (_handle == nullptr) {

const char *dlError = dlerror();
throw std::runtime_error((dlError != nullptr) ? dlError : "unknown dlopen error");
static const char *unknowDlopenError = "unknown dlopen error";
throw std::runtime_error((dlError != nullptr) ? dlError : unknowDlopenError);
}
}

Expand All @@ -60,7 +61,8 @@ void *DynamicLibrary::osGetSymbol(const std::string &symbol) const
if (sym == nullptr) {

const char *dlError = dlerror();
throw std::runtime_error((dlError != nullptr) ? dlError : "unknown dlsym error");
static const char *unknowDlsymError = "unknown dlsym error";
throw std::runtime_error((dlError != nullptr) ? dlError : unknowDlsymError);
}

return sym;
Expand Down