From 0c34ac2f0159645f6a2cd0f57a45ffae36b4352d Mon Sep 17 00:00:00 2001
From: KWSys Robot <kwrobot@kitware.com>
Date: Mon, 4 May 2015 10:27:45 -0400
Subject: [PATCH] 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
---
 .gitattributes    | 16 ++++++++++++++++
 DynamicLoader.cxx |  4 ++++
 Glob.hxx.in       |  6 ++++++
 3 files changed, 26 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..248786ef4
--- /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 66c7d5767..a776f97b0 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 39b7ce7e7..5239ccd22 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;