diff options
| author | Nick <[email protected]> | 2019-09-13 07:48:08 -0400 |
|---|---|---|
| committer | Nick <[email protected]> | 2019-09-13 07:48:08 -0400 |
| commit | ae63df6d86f995876f38ab3cdf47eac61ccda8cd (patch) | |
| tree | cd789844612b2a2d85fbd574926da02d9e4bee15 /src/tr1_hash_map.h | |
| parent | 9b1e6dba9f721c772e801abc4851a88aa61929da (diff) | |
Revert "Add src/ director formatting"
This reverts commit 26ca8de4a6ec9bfe422a14cbe325a5f257df453b.
Diffstat (limited to 'src/tr1_hash_map.h')
| -rw-r--r-- | src/tr1_hash_map.h | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/tr1_hash_map.h b/src/tr1_hash_map.h index 0672ef8..8c7513e 100644 --- a/src/tr1_hash_map.h +++ b/src/tr1_hash_map.h @@ -7,16 +7,14 @@ // // Redistributions of source code must retain the above copyright notice, this // list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, -// this +// Redistributions in binary form must reproduce the above copyright notice, this // list of conditions and the following disclaimer in the documentation and/or // other materials provided with the distribution. // Neither the name of The University of British Columbia nor the names of its // contributors may be used to endorse or promote products derived from this // software without specific prior written permission. // -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND // ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE @@ -27,27 +25,26 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#pragma once +#pragma once // detection and fallback for unordered_map in C++0x #ifdef __cplusplus -// detect GCC 4.3 or later and use unordered map (part of C++0x) -// unordered map doesn't play nice with _GLIBCXX_DEBUG, just use a map if its -// enabled. -#if defined(__GNUC__) and not defined(_GLIBCXX_DEBUG) -#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 -#include <unordered_map> -#define tr1_hash_map std::unordered_map -#define tr1_hash_map_ismap 0 -#else -#include <map> -#define tr1_hash_map std::map -#define tr1_hash_map_ismap 1 -#endif -#else -#include <map> -#define tr1_hash_map std::map -#define tr1_hash_map_ismap 1 -#endif + // detect GCC 4.3 or later and use unordered map (part of C++0x) + // unordered map doesn't play nice with _GLIBCXX_DEBUG, just use a map if its enabled. + #if defined( __GNUC__ ) and not defined( _GLIBCXX_DEBUG ) + #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 + #include <unordered_map> + #define tr1_hash_map std::unordered_map + #define tr1_hash_map_ismap 0 + #else + #include <map> + #define tr1_hash_map std::map + #define tr1_hash_map_ismap 1 + #endif + #else + #include <map> + #define tr1_hash_map std::map + #define tr1_hash_map_ismap 1 + #endif #endif |
