diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-09 18:59:27 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-09 18:59:27 (GMT) |
| commit | 258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40 (patch) | |
| tree | 0f78478948e6014ee0c55c1677533e05c616196b /googletest/include/gtest | |
| parent | 91ba05cc360a81a64cea53be1fe752944249d14c (diff) | |
| download | googletest-258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40.zip googletest-258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40.tar.gz googletest-258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40.tar.bz2 | |
cleanup, merge
Diffstat (limited to 'googletest/include/gtest')
| -rw-r--r-- | googletest/include/gtest/internal/custom/gtest-port.h | 3 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/custom/gtest.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-death-test-internal.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/custom/gtest-port.h b/googletest/include/gtest/internal/custom/gtest-port.h index c85f5d5..94884c1 100644 --- a/googletest/include/gtest/internal/custom/gtest-port.h +++ b/googletest/include/gtest/internal/custom/gtest-port.h @@ -61,6 +61,9 @@ // GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) // GTEST_LOCK_EXCLUDED_(locks) // +// Underlying library support features: +// GTEST_HAS_CXXABI_H_ +// // Exporting API symbols: // GTEST_API_ - Specifier for exported symbols. // diff --git a/googletest/include/gtest/internal/custom/gtest.h b/googletest/include/gtest/internal/custom/gtest.h index a7a1c0b..6f7c5e4 100644 --- a/googletest/include/gtest/internal/custom/gtest.h +++ b/googletest/include/gtest/internal/custom/gtest.h @@ -36,7 +36,7 @@ // GTEST_CUSTOM_TEMPDIR_FUNCTION_ - An override for testing::TempDir(). // See testing::TempDir for semantics and // signature. -// +// // ** Custom implementation starts here ** #ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ diff --git a/googletest/include/gtest/internal/gtest-death-test-internal.h b/googletest/include/gtest/internal/gtest-death-test-internal.h index 2b3a78f..8907f6f 100644 --- a/googletest/include/gtest/internal/gtest-death-test-internal.h +++ b/googletest/include/gtest/internal/gtest-death-test-internal.h @@ -27,7 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) // // The Google C++ Testing Framework (Google Test) // |