summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Robot <kwrobot@kitware.com>2015-05-04 14:27:45 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-05 13:12:18 (GMT)
commit0c34ac2f0159645f6a2cd0f57a45ffae36b4352d (patch)
treed78782ae3c7822b3c1ed349991f89c55155bd4cb
parentd34d5a370ec656aab6f980218d74002789fedfff (diff)
downloadCMake-0c34ac2f0159645f6a2cd0f57a45ffae36b4352d.zip
CMake-0c34ac2f0159645f6a2cd0f57a45ffae36b4352d.tar.gz
CMake-0c34ac2f0159645f6a2cd0f57a45ffae36b4352d.tar.bz2
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
-rw-r--r--.gitattributes16
-rw-r--r--DynamicLoader.cxx4
-rw-r--r--Glob.hxx.in6
3 files changed, 26 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..248786e
--- /dev/null
+++ b/.gitattributes
@@ -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
diff --git a/DynamicLoader.cxx b/DynamicLoader.cxx
index 66c7d57..a776f97 100644
--- a/DynamicLoader.cxx
+++ b/DynamicLoader.cxx
@@ -48,6 +48,10 @@ DynamicLoader::LibraryHandle DynamicLoader::OpenLibrary(const kwsys_stl::string&
//----------------------------------------------------------------------------
int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
{
+ if (!lib)
+ {
+ return 0;
+ }
return !shl_unload(lib);
}
diff --git a/Glob.hxx.in b/Glob.hxx.in
index 39b7ce7..5239ccd 100644
--- a/Glob.hxx.in
+++ b/Glob.hxx.in
@@ -59,6 +59,12 @@ public:
type(msg.type),
content(msg.content)
{}
+ Message& operator=(Message const& msg)
+ {
+ this->type = msg.type;
+ this->content = msg.content;
+ return *this;
+ }
};
typedef kwsys_stl::vector<Message> GlobMessages;