KWSys 2015-05-04 (c2387a4b)
Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ c2387a4b | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 69bccf2e..c2387a4b Brad King (3): 1ea01a46 Tell Git to export '.gitattributes' 4f39791b Glob: Add explicit assignment operator to Message member c2387a4b DynamicLoader: Fix CloseLibrary for failed OpenLibrary on HP-UX
This commit is contained in:
parent
d34d5a370e
commit
0c34ac2f01
|
@ -0,0 +1,16 @@
|
||||||
|
.git* export-ignore
|
||||||
|
.gitattributes -export-ignore
|
||||||
|
|
||||||
|
/GitSetup export-ignore
|
||||||
|
/SetupForDevelopment.sh export-ignore eol=lf
|
||||||
|
|
||||||
|
/CONTRIBUTING.rst conflict-marker-size=78
|
||||||
|
|
||||||
|
*.c whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.h whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.h.in whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.cxx whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.hxx whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.hxx.in whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.txt whitespace=tab-in-indent,no-lf-at-eof
|
||||||
|
*.cmake whitespace=tab-in-indent,no-lf-at-eof
|
|
@ -48,6 +48,10 @@ DynamicLoader::LibraryHandle DynamicLoader::OpenLibrary(const kwsys_stl::string&
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
|
int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
|
||||||
{
|
{
|
||||||
|
if (!lib)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
return !shl_unload(lib);
|
return !shl_unload(lib);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,12 @@ public:
|
||||||
type(msg.type),
|
type(msg.type),
|
||||||
content(msg.content)
|
content(msg.content)
|
||||||
{}
|
{}
|
||||||
|
Message& operator=(Message const& msg)
|
||||||
|
{
|
||||||
|
this->type = msg.type;
|
||||||
|
this->content = msg.content;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef kwsys_stl::vector<Message> GlobMessages;
|
typedef kwsys_stl::vector<Message> GlobMessages;
|
||||||
|
|
Loading…
Reference in New Issue