kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-kwsys' into update-kwsys

Browse Source
This commit is contained in:
Brad King 2015-05-05 09:12:21 -04:00
commit f6749f7274
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/kwsys/.gitattributes vendored Normal file
View File

@ -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

4
Source/kwsys/DynamicLoader.cxx
View File

@ -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);
} }

6
Source/kwsys/Glob.hxx.in
View File

@ -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;