[glom] Avoid a compiler warning.



commit 6da30a80b9ef58f305395cb1c1a46e5deba61178
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 18 21:08:37 2011 +0200

    Avoid a compiler warning.
    
    	* glom/libglom/data_structure/glomconversions.cc: format_time():
    	Return a result from the catch block.

 ChangeLog                                      |    7 +++++++
 glom/libglom/data_structure/glomconversions.cc |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1825330..f28f3bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-18  Murray Cumming  <murrayc murrayc com>
+
+	Avoid a compiler warning.
+
+	* glom/libglom/data_structure/glomconversions.cc: format_time():
+	Return a result from the catch block.
+
 2011-10-17  Murray Cumming  <murrayc murrayc com>
 
 	Avoid some copy/pasting of code.
diff --git a/glom/libglom/data_structure/glomconversions.cc b/glom/libglom/data_structure/glomconversions.cc
index d01d666..08644fc 100644
--- a/glom/libglom/data_structure/glomconversions.cc
+++ b/glom/libglom/data_structure/glomconversions.cc
@@ -47,6 +47,7 @@ Glib::ustring Conversions::format_time(const tm& tm_data)
   {
     std::cerr << G_STRFUNC << ": exception from std::locale(\"\")): " << ex.what() << std::endl;
     std::cerr << "  This can happen if the locale is not properly installed or configured." << std::endl;
+    return Glib::ustring();
   } 
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]