diff options
| author | Eric Milkie <milkie@10gen.com> | 2012-01-18 16:25:58 -0500 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-01-24 10:28:12 -0500 |
| commit | 076f88cf6fe68d1ae5a404934e5cd492f1436352 (patch) | |
| tree | 4026fb76347b16fa7c6dbeceeee49ff02490043b | |
| parent | 5ca3f271093ddd3c454a0aed45e5edddf5beb1c8 (diff) | |
| download | mongo-076f88cf6fe68d1ae5a404934e5cd492f1436352.tar.gz | |
avoid "unused local variable" warnings from g++
| -rw-r--r-- | util/scopeguard.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/util/scopeguard.h b/util/scopeguard.h index b87a4b51871..8ced04f47fc 100644 --- a/util/scopeguard.h +++ b/util/scopeguard.h @@ -421,7 +421,12 @@ namespace mongo #define LOKI_CONCATENATE(s1, s2) LOKI_CONCATENATE_DIRECT(s1, s2) #define LOKI_ANONYMOUS_VARIABLE(str) LOKI_CONCATENATE(str, __LINE__) -#define ON_BLOCK_EXIT ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) = MakeGuard -#define ON_BLOCK_EXIT_OBJ ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) = MakeObjGuard +#ifdef __GNUC__ +#define ON_BLOCK_EXIT ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) __attribute__ ((unused)) = MakeGuard +#define ON_BLOCK_EXIT_OBJ ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) __attribute__ ((unused)) = MakeObjGuard +#else +#define ON_BLOCK_EXIT ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) = MakeGuard +#define ON_BLOCK_EXIT_OBJ ScopeGuard LOKI_ANONYMOUS_VARIABLE(scopeGuard) = MakeObjGuard +#endif #endif //LOKI_SCOPEGUARD_H_ |