diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 10:17:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 10:17:09 -0700 |
| commit | 06b975928878a7a10cd4bc2bb35d2738e453f4a1 (patch) | |
| tree | b0c5b19fce9ae66b8071bd1b3b9a1e2175365358 /googlemock/include/gmock/internal/custom | |
| parent | 51b65058ad72d2d92fff89f04aad99f8bbddb147 (diff) | |
| parent | 997d343dd680e541ef96ce71ee54a91daf2577a0 (diff) | |
| download | googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.gz googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.bz2 googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.zip | |
Merge branch 'master' into ignore-cmake-generated-files
Diffstat (limited to 'googlemock/include/gmock/internal/custom')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/README.md | 16 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 6 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-port.h | 11 |
3 files changed, 18 insertions, 15 deletions
diff --git a/googlemock/include/gmock/internal/custom/README.md b/googlemock/include/gmock/internal/custom/README.md new file mode 100644 index 00000000..f6c93f61 --- /dev/null +++ b/googlemock/include/gmock/internal/custom/README.md @@ -0,0 +1,16 @@ +# Customization Points + +The custom directory is an injection point for custom user configurations. + +## Header `gmock-port.h` + +The following macros can be defined: + +### Flag related macros: + +* `GMOCK_DECLARE_bool_(name)` +* `GMOCK_DECLARE_int32_(name)` +* `GMOCK_DECLARE_string_(name)` +* `GMOCK_DEFINE_bool_(name, default_val, doc)` +* `GMOCK_DEFINE_int32_(name, default_val, doc)` +* `GMOCK_DEFINE_string_(name, default_val, doc)` diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index b9b7e3f8..14aafaab 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -27,12 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// ============================================================ -// An installation-specific extension point for gmock-matchers.h. -// ============================================================ +// Injection point for custom user configurations. See README for details // -// Adds google3 callback support to CallableTraits. - // GOOGLETEST_CM0002 DO NOT DELETE #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ diff --git a/googlemock/include/gmock/internal/custom/gmock-port.h b/googlemock/include/gmock/internal/custom/gmock-port.h index ad9ae36f..0030fe91 100644 --- a/googlemock/include/gmock/internal/custom/gmock-port.h +++ b/googlemock/include/gmock/internal/custom/gmock-port.h @@ -27,16 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Injection point for custom user configurations. -// The following macros can be defined: -// -// Flag related macros: -// GMOCK_DECLARE_bool_(name) -// GMOCK_DECLARE_int32_(name) -// GMOCK_DECLARE_string_(name) -// GMOCK_DEFINE_bool_(name, default_val, doc) -// GMOCK_DEFINE_int32_(name, default_val, doc) -// GMOCK_DEFINE_string_(name, default_val, doc) +// Injection point for custom user configurations. See README for details // // ** Custom implementation starts here ** |