[lmi-commits] [lmi] master e66446d 4/7: nullptr

[Greg Chicares]

branch: master
commit e66446dc2c00d37401d193631853522faf122574
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    nullptr
---
 alert_wx.cpp        |  2 +-
 msw_workarounds.cpp |  2 +-
 skeleton.cpp        | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/alert_wx.cpp b/alert_wx.cpp
index 6c3dff0..d60893c 100644
--- a/alert_wx.cpp
+++ b/alert_wx.cpp
@@ -154,7 +154,7 @@ void safe_message_alert(char const* message)
 {
     safely_show_on_stderr(message);
 #if defined LMI_MSW
-    HWND handle = 0;
+    HWND handle = nullptr;
     if(wxTheApp && wxTheApp->GetTopWindow())
         {
         handle = reinterpret_cast<HWND>(wxTheApp->GetTopWindow()->GetHandle());
diff --git a/msw_workarounds.cpp b/msw_workarounds.cpp
index 7383ddc..aad26ab 100644
--- a/msw_workarounds.cpp
+++ b/msw_workarounds.cpp
@@ -82,7 +82,7 @@ void MswDllPreloader::PreloadOneDll(std::string const& 
dll_name)
 
     fenv_initialize();
 
-    if(0 == ::LoadLibraryA(dll_name.c_str()))
+    if(nullptr == ::LoadLibraryA(dll_name.c_str()))
         {
         warning() << "Failed to preload '" << dll_name << "'." << LMI_FLUSH;
         }
diff --git a/skeleton.cpp b/skeleton.cpp
index d75df79..f5f0f8e 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -1193,18 +1193,18 @@ bool Skeleton::ProcessCommandLine()
     // TRICKY !! Some long options are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"ash_nazg"     ,NO_ARG   ,0 ,001 ,0 ,"ash nazg durbatulûk"},
-        {"ash_naz"      ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
-        {"mellon"       ,NO_ARG   ,0 ,002 ,0 ,"pedo mellon a minno"},
-        {"mello"        ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
-        {"prospicience" ,REQD_ARG ,0 ,003 ,0 ,"validation date"},
-        {"data_path"    ,REQD_ARG ,0 ,'d' ,0 ,"path to data files"},
-        {"file"         ,REQD_ARG ,0 ,'f' ,0 ,"input file to run"},
-        {"help"         ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
-        {"print_db"     ,NO_ARG   ,0 ,'p' ,0 ,"print products and exit"},
-        {"test_db"      ,NO_ARG   ,0 ,'t' ,0 ,"test products and exit"},
-        {"pyx"          ,REQD_ARG ,0 ,'x' ,0 ,"for docimasy"},
-        {0              ,NO_ARG   ,0 ,0   ,0 ,""}
+        {"ash_nazg"     ,NO_ARG   ,nullptr ,001 ,nullptr ,"ash nazg 
durbatulûk"},
+        {"ash_naz"      ,NO_ARG   ,nullptr ,077 ,nullptr ,"fraud"},
+        {"mellon"       ,NO_ARG   ,nullptr ,002 ,nullptr ,"pedo mellon a 
minno"},
+        {"mello"        ,NO_ARG   ,nullptr ,077 ,nullptr ,"fraud"},
+        {"prospicience" ,REQD_ARG ,nullptr ,003 ,nullptr ,"validation date"},
+        {"data_path"    ,REQD_ARG ,nullptr ,'d' ,nullptr ,"path to data 
files"},
+        {"file"         ,REQD_ARG ,nullptr ,'f' ,nullptr ,"input file to run"},
+        {"help"         ,NO_ARG   ,nullptr ,'h' ,nullptr ,"display this help 
and exit"},
+        {"print_db"     ,NO_ARG   ,nullptr ,'p' ,nullptr ,"print products and 
exit"},
+        {"test_db"      ,NO_ARG   ,nullptr ,'t' ,nullptr ,"test products and 
exit"},
+        {"pyx"          ,REQD_ARG ,nullptr ,'x' ,nullptr ,"for docimasy"},
+        {nullptr        ,NO_ARG   ,nullptr ,000 ,nullptr ,""}
       };
 
     std::vector<std::string> input_files;