[lmi-commits] [6280] Resolve gcc-5 issues (VZ)

[Greg Chicares]

Revision: 6280
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6280
Author:   chicares
Date:     2015-09-18 00:36:15 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Resolve gcc-5 issues (VZ)

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/alert_cgi.cpp
    lmi/trunk/alert_cli.cpp
    lmi/trunk/alert_wx.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-09-16 21:07:51 UTC (rev 6279)
+++ lmi/trunk/ChangeLog 2015-09-18 00:36:15 UTC (rev 6280)
@@ -36778,3 +36778,11 @@
   group_quote_pdf_gen_wx.cpp
 Keep the system usable even without proprietary graphics files.
 
+20150918T0036Z <address@hidden> [477]
+
+  alert_cgi.cpp
+  alert_cli.cpp
+  alert_wx.cpp
+Resolve gcc-5 issues (VZ). See:
+  http://lists.nongnu.org/archive/html/lmi/2015-09/msg00000.html
+

Modified: lmi/trunk/alert_cgi.cpp
===================================================================
--- lmi/trunk/alert_cgi.cpp     2015-09-16 21:07:51 UTC (rev 6279)
+++ lmi/trunk/alert_cgi.cpp     2015-09-18 00:36:15 UTC (rev 6280)
@@ -28,19 +28,18 @@
 
 #include "alert.hpp"
 
-#include <cstdio> // std::fputs()
+#include <cstdio>                       // std::fputs()
 #include <stdexcept>
 
 namespace
 {
-    bool ensure_setup = set_alert_functions
-        (status_alert
-        ,warning_alert
-        ,hobsons_choice_alert
-        ,fatal_error_alert
-        ,safe_message_alert
-        );
-
+volatile bool ensure_setup = set_alert_functions
+    (status_alert
+    ,warning_alert
+    ,hobsons_choice_alert
+    ,fatal_error_alert
+    ,safe_message_alert
+    );
 } // Unnamed namespace.
 
 void status_alert(std::string const&)

Modified: lmi/trunk/alert_cli.cpp
===================================================================
--- lmi/trunk/alert_cli.cpp     2015-09-16 21:07:51 UTC (rev 6279)
+++ lmi/trunk/alert_cli.cpp     2015-09-18 00:36:15 UTC (rev 6280)
@@ -28,7 +28,7 @@
 
 #include "alert.hpp"
 
-#include <cstdio> // std::fputs()
+#include <cstdio>                       // std::fputs()
 #include <iostream>
 #include <stdexcept>
 
@@ -38,35 +38,35 @@
 
 namespace
 {
-    bool ensure_setup = set_alert_functions
-        (status_alert
-        ,warning_alert
-        ,hobsons_choice_alert
-        ,fatal_error_alert
-        ,safe_message_alert
-        );
+volatile bool ensure_setup = set_alert_functions
+    (status_alert
+    ,warning_alert
+    ,hobsons_choice_alert
+    ,fatal_error_alert
+    ,safe_message_alert
+    );
 
-    bool continue_anyway()
-    {
-        int c;
+bool continue_anyway()
+{
+    int c;
   ask:
-        c = getch();
-        if('y' == c || 'Y' == c)
-            {
-            std::cout << std::endl;
-            return true;
-            }
-        else if('n' == c || 'N' == c)
-            {
-            std::cout << std::endl;
-            return false;
-            }
-        else
-            {
-            std::cerr << "\nPlease type 'y' or 'n'." << std::endl;
-            }
-    goto ask;
-    }
+    c = getch();
+    if('y' == c || 'Y' == c)
+        {
+        std::cout << std::endl;
+        return true;
+        }
+    else if('n' == c || 'N' == c)
+        {
+        std::cout << std::endl;
+        return false;
+        }
+    else
+        {
+        std::cerr << "\nPlease type 'y' or 'n'." << std::endl;
+        }
+goto ask;
+}
 } // Unnamed namespace.
 
 void status_alert(std::string const&)

Modified: lmi/trunk/alert_wx.cpp
===================================================================
--- lmi/trunk/alert_wx.cpp      2015-09-16 21:07:51 UTC (rev 6279)
+++ lmi/trunk/alert_wx.cpp      2015-09-18 00:36:15 UTC (rev 6280)
@@ -30,11 +30,11 @@
 
 #include "configurable_settings.hpp"
 
-#include <wx/app.h>                              // wxTheApp
+#include <wx/app.h>                     // wxTheApp
 #include <wx/frame.h>
 #include <wx/msgdlg.h>
 #if defined LMI_MSW
-#   include <wx/msw/wrapwin.h>                   // HWND etc.
+#   include <wx/msw/wrapwin.h>          // HWND etc.
 #endif // defined LMI_MSW
 
 #include <cstdio>
@@ -42,7 +42,7 @@
 
 namespace
 {
-bool ensure_setup = set_alert_functions
+volatile bool ensure_setup = set_alert_functions
     (status_alert
     ,warning_alert
     ,hobsons_choice_alert