diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-09 15:21:54 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-09 15:21:54 +0000 |
| commit | 27e0321aadb8c2c656af795612836cf896f0557d (patch) | |
| tree | 7624fc2d71c047c04fe2c3c927b645f19760fdee /libstdc++-v3/include/backward/hash_map | |
| parent | cf4848768d6fbbbaec367eb8107504f1803091e2 (diff) | |
| download | gcc-27e0321aadb8c2c656af795612836cf896f0557d.tar.gz | |
2009-10-09 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 152583 after the LTO merge
inside trunk.
[during merge with trunk 152583 the version information from GCC
is used, not the checksum of the executable!]
* gcc/melt-runtime.h (melt_gccversionstr): added extern declaration.
* gcc/melt-runtime.c: Moved the #include before everything else.
Updated comment NOTE about gengtype - which is now compatible
with the trunk's.
(melt_gccversionstr): added declaration.
(load_checked_dynamic_module_index): use a gcc version string in
modules, not a checksum of the executable.
(melt_really_initialize): get a second argument for the gcc
version string. Initialize melt_gccversionstr with it.
(plugin_init): Build the gccversionstr out of gcc_version
structure.
(melt_initialize): calls melt_really_initialize with
version_string.
(melt_output_cfile_decl_impl): generates a genversionstr_melt
instead of a genchecksum_melt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@152591 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/backward/hash_map')
| -rw-r--r-- | libstdc++-v3/include/backward/hash_map | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/include/backward/hash_map b/libstdc++-v3/include/backward/hash_map index 469429ccc24..cb31687c008 100644 --- a/libstdc++-v3/include/backward/hash_map +++ b/libstdc++-v3/include/backward/hash_map @@ -58,7 +58,11 @@ #include "backward_warning.h" #include <bits/c++config.h> +#ifdef _GLIBCXX_PROFILE +#include <profile/hashtable.h> +#else #include <backward/hashtable.h> +#endif #include <bits/concept_check.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) |