diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-07-29 20:38:22 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-07-29 20:38:22 -0700 |
| commit | 6de230f443c7e13fb3836b411b5545e5615765fa (patch) | |
| tree | 7e45943942cfca2e9016e87bd12d2eae5c4ad143 | |
| parent | c47de319ccd918caccfc1f3ee394e48f6d4e4dc5 (diff) | |
| parent | 472427d9ab77a4d1f37285399c3789837b77d74f (diff) | |
| download | vyatta-cfg-6de230f443c7e13fb3836b411b5545e5615765fa.tar.gz vyatta-cfg-6de230f443c7e13fb3836b411b5545e5615765fa.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg into oxnard
| -rw-r--r-- | src/cli_new.c | 1 | ||||
| -rw-r--r-- | src/cstore/svector.hpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/cli_new.c b/src/cli_new.c index 3498025..87c5087 100644 --- a/src/cli_new.c +++ b/src/cli_new.c @@ -89,7 +89,6 @@ static int eval_va(valstruct *res, vtw_node *node); static int expand_string(char *p); static void free_node(vtw_node *node); static void free_node_tree(vtw_node *node); -static void free_reuse_list(void); void free_path(vtw_path *path); static void free_string(char *str); static vtw_node * get_node(void); diff --git a/src/cstore/svector.hpp b/src/cstore/svector.hpp index bc04fdc..44d67b9 100644 --- a/src/cstore/svector.hpp +++ b/src/cstore/svector.hpp @@ -81,7 +81,12 @@ public: return _data; }; size_t hash() const { +#if __GNUC_MAJOR__ == 4 && __GNUC_MINOR__ < 6 return std::tr1::_Fnv_hash<sizeof(size_t)>::hash(_data, _len); +#else + // Newer glibc has different internal + return std::tr1::_Fnv_hash_base<sizeof(size_t)>::hash(_data, _len); +#endif }; std::string to_string() const { return to_string(Int2Type<RAW_CSTR_DATA>()); |