diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 14:45:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 14:45:55 -0500 |
| commit | 23015249236e60b94b5010330ef687de43d2e923 (patch) | |
| tree | 411f3fe8945689486edb35084e71fccce1df3907 | |
| parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
| parent | 1df907381de5483def338eff280697e0dafb2b75 (diff) | |
| download | googletest-23015249236e60b94b5010330ef687de43d2e923.tar.gz googletest-23015249236e60b94b5010330ef687de43d2e923.tar.bz2 googletest-23015249236e60b94b5010330ef687de43d2e923.zip | |
Merge pull request #1393 from gennadiycivil/master
cleanup, merge
| -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 c85f5d58..94884c15 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 a7a1c0b7..6f7c5e40 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 2b3a78f5..8907f6f9 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) // |