From 8fbce0288e8f83654383f903d92f2a0c22c5e8d6 Mon Sep 17 00:00:00 2001 From: Owen Clarke Date: Mon, 27 Jun 2011 22:40:45 -0400 Subject: [PATCH] Bug #794 - Corrected typo and missing ; for Solaris builds. Signed-off-by: Paul Beckingham --- ChangeLog | 3 ++- src/DOM.cpp | 2 +- src/Directory.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70bd83bff..b28e913c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,7 +120,8 @@ Clarke). + Fixed bug #788, which reported regex and readline versions, even though they are not used. - + Fixed bug #792, so that cmake now recognizes Solaris (thanks to Owen Clarke). + + Fixed bug #792 & #794, so that cmake now recognizes Solaris (thanks to Owen + Clarke). # Untracked Bugs, biggest first. + Fixed bug that required the '%YAML' prologue in a YAML import. diff --git a/src/DOM.cpp b/src/DOM.cpp index 6d7d76664..04ee4e3ff 100644 --- a/src/DOM.cpp +++ b/src/DOM.cpp @@ -157,7 +157,7 @@ const std::string DOM::get (const std::string& name) #elif defined (LINUX) return /*_cache[name] =*/ "Linux"; #else - return /*_cache[name] =*/ STRING_DOM_UNKNOWN + return /*_cache[name] =*/ STRING_DOM_UNKNOWN; #endif else diff --git a/src/Directory.cpp b/src/Directory.cpp index f99c36509..15488a2bd 100644 --- a/src/Directory.cpp +++ b/src/Directory.cpp @@ -109,7 +109,7 @@ bool Directory::remove_directory (const std::string& dir) struct stat s; stat (de->d_name, &s); if (s.st_mode & S_IFDIR) - remove_directory (dir + "/" + de->de_name); + remove_directory (dir + "/" + de->d_name); else unlink ((dir + "/" + de->d_name).c_str ()); #else