Resolve VS and MinGW warnings (#595)
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 28 Apr 2015 18:07:44 +0200
changeset 1135c199e9976d93
parent 1134 f70f688d9ef9
child 1136 20f95cd51aba
child 1137 ca4e4a5e9b6e
Resolve VS and MinGW warnings (#595)
lemon/bits/windows.cc
lemon/core.h
test/radix_sort_test.cc
     1.1 --- a/lemon/bits/windows.cc	Tue Apr 28 18:07:07 2015 +0200
     1.2 +++ b/lemon/bits/windows.cc	Tue Apr 28 18:07:44 2015 +0200
     1.3 @@ -21,6 +21,10 @@
     1.4  
     1.5  #include<lemon/bits/windows.h>
     1.6  
     1.7 +#if defined(LEMON_WIN32) && defined(__GNUC__)
     1.8 +#pragma GCC diagnostic ignored "-Wold-style-cast"
     1.9 +#endif
    1.10 +
    1.11  #ifdef LEMON_WIN32
    1.12  #ifndef WIN32_LEAN_AND_MEAN
    1.13  #define WIN32_LEAN_AND_MEAN
     2.1 --- a/lemon/core.h	Tue Apr 28 18:07:07 2015 +0200
     2.2 +++ b/lemon/core.h	Tue Apr 28 18:07:44 2015 +0200
     2.3 @@ -19,13 +19,12 @@
     2.4  #ifndef LEMON_CORE_H
     2.5  #define LEMON_CORE_H
     2.6  
     2.7 -#include <vector>
     2.8 -#include <algorithm>
     2.9 -
    2.10 -#include <lemon/config.h>
    2.11 -#include <lemon/bits/enable_if.h>
    2.12 -#include <lemon/bits/traits.h>
    2.13 -#include <lemon/assert.h>
    2.14 +///\file
    2.15 +///\brief LEMON core utilities.
    2.16 +///
    2.17 +///This header file contains core utilities for LEMON.
    2.18 +///It is automatically included by all graph types, therefore it usually
    2.19 +///do not have to be included directly.
    2.20  
    2.21  // Disable the following warnings when compiling with MSVC:
    2.22  // C4250: 'class1' : inherits 'class2::member' via dominance
    2.23 @@ -43,12 +42,15 @@
    2.24  #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
    2.25  #endif
    2.26  
    2.27 -///\file
    2.28 -///\brief LEMON core utilities.
    2.29 -///
    2.30 -///This header file contains core utilities for LEMON.
    2.31 -///It is automatically included by all graph types, therefore it usually
    2.32 -///do not have to be included directly.
    2.33 +#include <vector>
    2.34 +#include <algorithm>
    2.35 +
    2.36 +#include <lemon/config.h>
    2.37 +#include <lemon/bits/enable_if.h>
    2.38 +#include <lemon/bits/traits.h>
    2.39 +#include <lemon/assert.h>
    2.40 +
    2.41 +
    2.42  
    2.43  namespace lemon {
    2.44  
     3.1 --- a/test/radix_sort_test.cc	Tue Apr 28 18:07:07 2015 +0200
     3.2 +++ b/test/radix_sort_test.cc	Tue Apr 28 18:07:44 2015 +0200
     3.3 @@ -16,6 +16,8 @@
     3.4   *
     3.5   */
     3.6  
     3.7 +#include <lemon/core.h>
     3.8 +
     3.9  #include <lemon/time_measure.h>
    3.10  #include <lemon/smart_graph.h>
    3.11  #include <lemon/maps.h>