Wireshark-commits: [Wireshark-commits] master b05803d: CMake: Add /WX
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 16 Oct 2015 21:32:30 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b05803db4b7079307565e423a8caf828949add49
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b05803d by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Add /WX
    
    Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off,
    similar to config.nmake.
    
    We haven't compiled C++ code with -Wshorten-64-to-32 for quite 
    some time so there's no need to add -Wno-shorten-64-to-32 in
    ui/qt/CMakeLists.txt.
    
    Additionally, squelch
    
    ----
    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
            C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled
            with
            [
                _RanIt=QList<QString>::iterator
    ,            _Pr=bool (__cdecl *)(const QString &,const QString &)
            ]
            C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled
            with
            [
                _RanIt=QList<QString>::iterator
    ,            _Pr=bool (__cdecl *)(const QString &,const QString &)
            ]
            C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled
            with
            [
                _Iter=QList<QString>::iterator
    ,            _RanIt=QList<QString>::iterator
    ,            _Diff=int
    ,            _Pr=bool (__cdecl *)(const QString &,const QString &)
            ]
            .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled
            with
            [
                _RanIt=QList<QString>::iterator
    ,            _Pr=bool (__cdecl *)(const QString &,const QString &)
            ]
    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
    ----
    
    in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp
    so that we'll compile successfully.
    
    Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357
    Reviewed-on: https://code.wireshark.org/review/10533
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  1ecb4de   rtp_player(.h): fix empty paragraph passed to '@param' command [-Wdocumentation]
    adds  b05803d   CMake: Add /WX


Summary of changes:
 CMakeLists.txt                             |   26 ++++++++++++++++++--------
 capchild/CMakeLists.txt                    |    4 ++--
 caputils/CMakeLists.txt                    |    4 ++--
 echld/CMakeLists.txt                       |    5 ++---
 epan/CMakeLists.txt                        |    4 ++--
 epan/dissectors/dcerpc/CMakeLists.txt      |    4 ++--
 plugins/docsis/CMakeLists.txt              |    4 ++--
 plugins/ethercat/CMakeLists.txt            |    4 ++--
 plugins/gryphon/CMakeLists.txt             |    4 ++--
 plugins/irda/CMakeLists.txt                |    4 ++--
 plugins/m2m/CMakeLists.txt                 |    4 ++--
 plugins/mate/CMakeLists.txt                |    4 ++--
 plugins/opcua/CMakeLists.txt               |    4 ++--
 plugins/profinet/CMakeLists.txt            |    4 ++--
 plugins/stats_tree/CMakeLists.txt          |    4 ++--
 plugins/tpg/CMakeLists.txt                 |    4 ++--
 plugins/unistim/CMakeLists.txt             |    4 ++--
 plugins/wimax/CMakeLists.txt               |    4 ++--
 plugins/wimaxasncp/CMakeLists.txt          |    4 ++--
 plugins/wimaxmacphy/CMakeLists.txt         |    4 ++--
 tools/lemon/CMakeLists.txt                 |    4 ++--
 ui/CMakeLists.txt                          |    4 ++--
 ui/gtk/CMakeLists.txt                      |    4 ++--
 ui/qt/CMakeLists.txt                       |   12 ++----------
 ui/qt/rpc_service_response_time_dialog.cpp |   10 ++++++++++
 ui/qt/wireshark_application.cpp            |   10 ++++++++++
 wiretap/CMakeLists.txt                     |    4 ++--
 wsutil/CMakeLists.txt                      |    4 ++--
 28 files changed, 88 insertions(+), 67 deletions(-)