diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-05-05 12:58:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-06 12:46:54 (GMT) |
| commit | 397bccbaa94e6d17d15d17af2158fa6325d5c1e9 (patch) | |
| tree | 76aaac8069e65ab8b3e5ed3073808671365b009b | |
| parent | c54be58309fbf9c2a5cfec8ba190c631e1db4a6c (diff) | |
| download | CMake-397bccbaa94e6d17d15d17af2158fa6325d5c1e9.zip CMake-397bccbaa94e6d17d15d17af2158fa6325d5c1e9.tar.gz CMake-397bccbaa94e6d17d15d17af2158fa6325d5c1e9.tar.bz2 | |
KWSys 2014-05-05 (f3a36760)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ f3a36760 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 8b085635..f3a36760
Brad King (2):
1979c02d hashtable: Poison operator= on internal node type
f3a36760 SystemInformation: Include backtrace APIs whenever we use them
Change-Id: Ic90b29e4fbae139ab6c8bd7355661759153e0aa7
| -rw-r--r-- | SystemInformation.cxx | 43 | ||||
| -rw-r--r-- | hashtable.hxx.in | 3 |
2 files changed, 18 insertions, 28 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 720a7c3..6544098 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -88,15 +88,6 @@ typedef int siginfo_t; # include <ifaddrs.h> # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif #endif #if defined(__OpenBSD__) || defined(__NetBSD__) @@ -126,16 +117,8 @@ typedef int siginfo_t; # include <ifaddrs.h> # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif -# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050 -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif +# if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050) +# undef KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE # endif #endif @@ -150,15 +133,6 @@ typedef int siginfo_t; # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif # endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif # if defined(KWSYS_CXX_HAS_RLIMIT64) typedef struct rlimit64 ResourceLimitType; # define GetResourceLimit getrlimit64 @@ -178,6 +152,19 @@ typedef struct rlimit ResourceLimitType; # include <OS.h> #endif +#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) +# include <execinfo.h> +# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) +# include <cxxabi.h> +# endif +# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) +# include <dlfcn.h> +# endif +#else +# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE +# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP +#endif + #include <memory.h> #include <stdlib.h> #include <stdio.h> diff --git a/hashtable.hxx.in b/hashtable.hxx.in index 62aa3f3..b93e9be 100644 --- a/hashtable.hxx.in +++ b/hashtable.hxx.in @@ -310,6 +310,9 @@ struct _Hashtable_node { _Hashtable_node* _M_next; _Val _M_val; + void public_method_to_quiet_warning_about_all_methods_private(); +private: + void operator=(_Hashtable_node<_Val> const&); // poison node assignment }; template <class _Val, class _Key, class _HashFcn, |