diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 18:24:25 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 16:32:40 +0200 |
| commit | 4ce69f7403811819800e7c5ae1318b2647e778d1 (patch) | |
| tree | 2ec3a98b5abef002670a0916354eb7e0abfe2aa2 /chromium/third_party/protobuf/config.h | |
| parent | a6dd70e0328d155d5df8d6df48afbab690b08fb6 (diff) | |
| download | qtwebengine-chromium-4ce69f7403811819800e7c5ae1318b2647e778d1.tar.gz | |
Update Chromium snapshot to stable version 33.0.1750.170
This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.
Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/protobuf/config.h')
| -rw-r--r-- | chromium/third_party/protobuf/config.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/chromium/third_party/protobuf/config.h b/chromium/third_party/protobuf/config.h index affcf55be5f..dcc0041c2fe 100644 --- a/chromium/third_party/protobuf/config.h +++ b/chromium/third_party/protobuf/config.h @@ -1,32 +1,31 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -#if defined(USE_UNORDERED_CONTAINERS) - -#define HASH_MAP_H <unordered_map> -#define HASH_SET_H <unordered_set> -#define HASH_NAMESPACE std -#define HASH_MAP_CLASS unordered_map -#define HASH_SET_CLASS unordered_set +/* the name of <hash_set> */ +#define HASH_MAP_CLASS hash_map +/* the location of <hash_map> */ +#if defined(USE_STLPORT) +#define HASH_MAP_H <hash_map> #else +#define HASH_MAP_H <ext/hash_map> +#endif +/* the namespace of hash_map/hash_set */ #if defined(USE_STLPORT) -#define HASH_MAP_H <hash_map> -#define HASH_SET_H <hash_set> #define HASH_NAMESPACE std #else -#define HASH_MAP_H <ext/hash_map> -#define HASH_SET_H <ext/hash_set> #define HASH_NAMESPACE __gnu_cxx #endif /* the name of <hash_set> */ -#define HASH_MAP_CLASS hash_map - -/* the name of <hash_set> */ #define HASH_SET_CLASS hash_set +/* the location of <hash_set> */ +#if defined(USE_STLPORT) +#define HASH_SET_H <hash_set> +#else +#define HASH_SET_H <ext/hash_set> #endif /* Define to 1 if you have the <dlfcn.h> header file. */ |