diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-14 12:55:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 12:55:13 -0700 |
| commit | e26771776b26b690c98edd99a949ae6c8638e03b (patch) | |
| tree | c98bf51459b6be1fa3513880f7735ace626ee1c0 /googlemock/include/gmock/internal/custom | |
| parent | 9ca399ae053d0a2a4d206fffe9ab76f577dbe22e (diff) | |
| parent | 3306848f697568aacf4bcca330f6bdd5ce671899 (diff) | |
| download | googletest-e26771776b26b690c98edd99a949ae6c8638e03b.tar.gz googletest-e26771776b26b690c98edd99a949ae6c8638e03b.tar.bz2 googletest-e26771776b26b690c98edd99a949ae6c8638e03b.zip | |
Merge branch 'master' into cmake-binary-dir-fix
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 | 4 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-port.h | 11 |
3 files changed, 18 insertions, 13 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 227d91f6..14aafaab 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -27,9 +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. // -// ============================================================ -// An installation-specific extension point for gmock-matchers.h. -// ============================================================ +// Injection point for custom user configurations. See README for details // // GOOGLETEST_CM0002 DO NOT DELETE 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 ** |