diff options
Diffstat (limited to 'include/gmock/gmock-actions.h')
-rw-r--r-- | include/gmock/gmock-actions.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index d6a3e148..7e9708ec 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -36,13 +36,13 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ -#include <algorithm> -#include <string> - #ifndef _WIN32_WCE # include <errno.h> #endif +#include <algorithm> +#include <string> + #include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-port.h" @@ -189,6 +189,7 @@ class DefaultValue { return value_ == NULL ? internal::BuiltInDefaultValue<T>::Get() : *value_; } + private: static const T* value_; }; @@ -224,6 +225,7 @@ class DefaultValue<T&> { return address_ == NULL ? internal::BuiltInDefaultValue<T&>::Get() : *address_; } + private: static T* address_; }; |