[lmi-commits] [5135] Resolve issues discovered with libstdc++ debug mode

[Greg Chicares]

Revision: 5135
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5135
Author:   chicares
Date:     2010-12-22 04:16:18 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Resolve issues discovered with libstdc++ debug mode

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/name_value_pairs.hpp
    lmi/trunk/wx_utility.cpp
    lmi/trunk/yare_input.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-12-20 23:55:20 UTC (rev 5134)
+++ lmi/trunk/ChangeLog 2010-12-22 04:16:18 UTC (rev 5135)
@@ -27094,3 +27094,10 @@
   getopt_test.cpp
 Resolve an ancient defect.
 
+20101222T0416Z <address@hidden> [654]
+
+  name_value_pairs.hpp
+  wx_utility.cpp
+  yare_input.cpp
+Resolve issues discovered with libstdc++ debug mode.
+

Modified: lmi/trunk/name_value_pairs.hpp
===================================================================
--- lmi/trunk/name_value_pairs.hpp      2010-12-20 23:55:20 UTC (rev 5134)
+++ lmi/trunk/name_value_pairs.hpp      2010-12-22 04:16:18 UTC (rev 5135)
@@ -30,6 +30,7 @@
 #include "uncopyable_lmi.hpp"
 
 #include <map>
+#include <string>
 
 /// Design notes for class name_value_pairs.
 ///

Modified: lmi/trunk/wx_utility.cpp
===================================================================
--- lmi/trunk/wx_utility.cpp    2010-12-20 23:55:20 UTC (rev 5134)
+++ lmi/trunk/wx_utility.cpp    2010-12-22 04:16:18 UTC (rev 5135)
@@ -36,8 +36,10 @@
 
 #include <wx/app.h>                     // wxTheApp
 #include <wx/bookctrl.h>
+// Include <wx/dataobj.h> before <wx/clipbrd.h> as explained here:
+//   http://lists.nongnu.org/archive/html/lmi/2010-12/msg00002.html
+#include <wx/dataobj.h>
 #include <wx/clipbrd.h>
-#include <wx/dataobj.h>
 #include <wx/datetime.h>
 #include <wx/msgdlg.h>
 #include <wx/utils.h>                   // wxSafeYield()

Modified: lmi/trunk/yare_input.cpp
===================================================================
--- lmi/trunk/yare_input.cpp    2010-12-20 23:55:20 UTC (rev 5134)
+++ lmi/trunk/yare_input.cpp    2010-12-22 04:16:18 UTC (rev 5135)
@@ -31,6 +31,9 @@
 #include "input.hpp"
 #include "miscellany.hpp" // each_equal()
 
+#include <boost/type_traits/is_enum.hpp>
+#include <boost/utility/enable_if.hpp>
+
 #include <numeric>        // std::accumulate()
 
 namespace
@@ -38,6 +41,7 @@
 template<typename T>
 std::vector<T> convert_vector_type
     (std::vector<mc_enum<T> > const& ve
+    ,typename boost::enable_if<boost::is_enum<T> >::type* = 0
     )
 {
     std::vector<T> z;