Merge branch 'upstream-kwsys' into update-kwsys

This commit is contained in:
Brad King 2014-12-18 10:17:20 -05:00
commit 2e9acb6d43
1 changed files with 16 additions and 0 deletions

View File

@ -65,6 +65,15 @@
See the comments below for specific explanations of each macro. See the comments below for specific explanations of each macro.
*/ */
/* Disable -Wcast-qual warnings since they are too hard to fix in a
cross-platform way. */
#if defined(__clang__) && defined(__has_warning)
# if __has_warning("-Wcast-qual")
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wcast-qual"
# endif
#endif
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* Full path to the directory in which this executable is built. Do /* Full path to the directory in which this executable is built. Do
@ -917,6 +926,13 @@ static int @KWSYS_NAMESPACE@_shared_forward_to_real(int argc, char** argv_in)
return 1; return 1;
} }
/* Restore warning stack. */
#if defined(__clang__) && defined(__has_warning)
# if __has_warning("-Wcast-qual")
# pragma clang diagnostic pop
# endif
#endif
#else #else
# error "@KWSYS_NAMESPACE@/SharedForward.h should be included only once." # error "@KWSYS_NAMESPACE@/SharedForward.h should be included only once."
#endif #endif