gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds macro GTEST_DISALLOW_ASSIGN_, needed by gmock.

Browse Source
This commit is contained in:
zhanyong.wan 2009-12-23 00:09:23 +00:00
parent 940ce8a210
commit 7b0c8dd3a9
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/gtest/internal/gtest-port.h
View File

@ -105,6 +105,7 @@
// GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning. // GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
// GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a // GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a
// variable don't have to be used. // variable don't have to be used.
// GTEST_DISALLOW_ASSIGN_ - disables operator=.
// GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. // GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
// GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. // GTEST_MUST_USE_RESULT_ - declares that a function's result must be used.
// //
@ -163,6 +164,8 @@
#endif // !_WIN32_WCE #endif // !_WIN32_WCE
#include <iostream> // NOLINT #include <iostream> // NOLINT
#include <sstream> // NOLINT
#include <string> // NOLINT
#define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" #define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
#define GTEST_FLAG_PREFIX_ "gtest_" #define GTEST_FLAG_PREFIX_ "gtest_"
@ -295,9 +298,6 @@
(GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING) (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING)
#endif // GTEST_HAS_GLOBAL_WSTRING #endif // GTEST_HAS_GLOBAL_WSTRING
#include <string> // NOLINT
#include <sstream> // NOLINT
// Determines whether RTTI is available. // Determines whether RTTI is available.
#ifndef GTEST_HAS_RTTI #ifndef GTEST_HAS_RTTI
// The user didn't tell us whether RTTI is enabled, so we need to // The user didn't tell us whether RTTI is enabled, so we need to
@ -501,11 +501,16 @@
#define GTEST_ATTRIBUTE_UNUSED_ #define GTEST_ATTRIBUTE_UNUSED_
#endif #endif
// A macro to disallow the evil copy constructor and operator= functions // A macro to disallow operator=
// This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_ASSIGN_(type)\
void operator=(type const &)
// A macro to disallow copy constructor and operator=
// This should be used in the private: declarations for a class. // This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\ #define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\
type(const type &);\ type(type const &);\
void operator=(const type &) GTEST_DISALLOW_ASSIGN_(type)
// Tell the compiler to warn about unused return values for functions declared // Tell the compiler to warn about unused return values for functions declared
// with this macro. The macro should be used on function declarations // with this macro. The macro should be used on function declarations

2
scons/SConstruct.common
View File

@ -87,6 +87,8 @@ class SConstructHelper:
# And another that definitely always points to the project root. # And another that definitely always points to the project root.
self.env_base['PROJECT_ROOT'] = self.env_base.Dir('.').abspath self.env_base['PROJECT_ROOT'] = self.env_base.Dir('.').abspath
self.env_base['OBJ_SUFFIX'] = '' # Default suffix for object files.
# Enable scons -h # Enable scons -h
Help(vars.GenerateHelpText(self.env_base)) Help(vars.GenerateHelpText(self.env_base))