diff options
| author | BrukerJWD <jonathan.wendeborn@bruker.com> | 2018-10-16 06:37:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 06:37:56 (GMT) |
| commit | 8c82ba48e433005b9e25835b4a342ef4dcc0cfc0 (patch) | |
| tree | e1ae94f37108a8f506cd4d11eec0e058c2c39980 /googletest/test/gtest_environment_test.cc | |
| parent | 6bbf911a8dc0c42ad05135f26a07f4893eb83916 (diff) | |
| parent | a651a4d44e65b749467fa3dddf93819a22f0cc4a (diff) | |
| download | googletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.zip googletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.tar.gz googletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.tar.bz2 | |
Merge branch 'master' into isnice
Diffstat (limited to 'googletest/test/gtest_environment_test.cc')
| -rw-r--r-- | googletest/test/gtest_environment_test.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/googletest/test/gtest_environment_test.cc b/googletest/test/gtest_environment_test.cc index 3cff19e..bc9524d 100644 --- a/googletest/test/gtest_environment_test.cc +++ b/googletest/test/gtest_environment_test.cc @@ -26,18 +26,14 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // // Tests using global test environments. #include <stdlib.h> #include <stdio.h> #include "gtest/gtest.h" - -#define GTEST_IMPLEMENTATION_ 1 // Required for the next #include. #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { GTEST_DECLARE_string_(filter); |