Fix compiler warning for Utility::GlobRecursive.

Refs #5246

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index a587b066013d7d32ceb5caf308f87047955423ea..0c772c0d07de0d03a1100e66ef1c341daabdf5b7 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -418,7 +418,7 @@ bool Utility::Glob(const String& pathSpec, const boost::function<void (const Str
  * @param callback The callback which is invoked for each matching file.
  * @param type The file type (a combination of GlobFile and GlobDirectory)
  */
-void Utility::GlobRecursive(const String& path, const String& pattern, const boost::function<void (const String&)>& callback, int type)
+bool Utility::GlobRecursive(const String& path, const String& pattern, const boost::function<void (const String&)>& callback, int type)
 {
 #ifdef _WIN32
        HANDLE handle;
@@ -463,8 +463,6 @@ void Utility::GlobRecursive(const String& path, const String& pattern, const boo
                    << boost::errinfo_api_function("FindClose")
                    << errinfo_win32_error(GetLastError()));
        }
-
-       return true;
 #else /* _WIN32 */
        DIR *dirp;
 
@@ -521,6 +519,8 @@ void Utility::GlobRecursive(const String& path, const String& pattern, const boo
                callback(cpath);
        }
 #endif /* _WIN32 */
+
+       return true;
 }
 
 #ifndef _WIN32

diff --git a/lib/base/utility.h b/lib/base/utility.h
index d1c5f4a76af4378454a78b9c49a678124afcb1a3..ba070a6af425c3b6dbe7d8bb2de602bbfd56dba5 100644 (file)
--- a/lib/base/utility.h
+++ b/lib/base/utility.h
@@ -76,7 +76,7 @@ public:
        static String NewUniqueID(void);
 
        static bool Glob(const String& pathSpec, const boost::function<void (const String&)>& callback, int type = GlobFile | GlobDirectory);
-       static void GlobRecursive(const String& path, const String& pattern, const boost::function<void (const String&)>& callback, int type = GlobFile | GlobDirectory);
+       static bool GlobRecursive(const String& path, const String& pattern, const boost::function<void (const String&)>& callback, int type = GlobFile | GlobDirectory);
 
        static void QueueAsyncCallback(const boost::function<void (void)>& callback);