summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorJonny007-MKD <me@jonny007-mkd.de>2018-09-18 19:54:36 (GMT)
committerJonny007-MKD <me@jonny007-mkd.de>2018-09-18 19:54:36 (GMT)
commit6a1c3d9b788bedad993aa57690cc1c8cb4b871ba (patch)
tree3e49c5b80cae51068e3d81d2ccd240160bdc398b /googletest
parentc40f55a229f6d3d33f00c942585ea642135881db (diff)
downloadgoogletest-6a1c3d9b788bedad993aa57690cc1c8cb4b871ba.zip
googletest-6a1c3d9b788bedad993aa57690cc1c8cb4b871ba.tar.gz
googletest-6a1c3d9b788bedad993aa57690cc1c8cb4b871ba.tar.bz2
Removed some newlinesrefs/pull/1832/head
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index 50bc52d..0dbf100 100644
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
@@ -1242,22 +1242,19 @@ private:
} \
catch (const std::exception& e) { \
if (!gtest_caught_expected) { \
- message.set( \
- "it throws a different type " \
+ message.set("it throws a different type " \
"with message: " + std::string(e.what())); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} \
catch (...) { \
if (!gtest_caught_expected) { \
- message.set( \
- "it throws a different type."); \
+ message.set("it throws a different type."); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} \
if (!gtest_caught_expected) { \
- message.set( \
- "it throws nothing."); \
+ message.set("it throws nothing."); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} else \