diff options
| author | Haidong Ji | 2018-08-29 21:13:53 -0500 |
|---|---|---|
| committer | Haidong Ji | 2018-08-29 21:13:53 -0500 |
| commit | 38e8b768a30721a575abe6613f6492d3bb06d806 (patch) | |
| tree | c39a95b6ddb989ffa1ee3393ac925a9eed090609 | |
| parent | 0144b21da618acf0737d3ee35b2aaa41e2064a27 (diff) | |
| parent | 13823672a0b4c014abeb3f77145328576059fa9f (diff) | |
Fixing merging errors
| -rw-r--r-- | PlaygroundCpp/.cproject | 6 | ||||
| -rw-r--r-- | PlaygroundCpp/Sources/Playground.cpp | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/PlaygroundCpp/.cproject b/PlaygroundCpp/.cproject index 6299ddd..83e6d3d 100644 --- a/PlaygroundCpp/.cproject +++ b/PlaygroundCpp/.cproject @@ -65,13 +65,13 @@ <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1593738472" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"> - <option id="gnu.cpp.link.option.paths.1593365739" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> + <option id="gnu.cpp.link.option.paths.1593365739" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> <listOptionValue builtIn="false" value="/home/haidong/googletest/build/googlemock/gtest"/> </option> - <option id="gnu.cpp.link.option.libs.2046973616" superClass="gnu.cpp.link.option.libs" valueType="libs"> + <option id="gnu.cpp.link.option.libs.2046973616" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="gtest"/> @@ -91,7 +91,7 @@ <tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.183585801" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug"> - <option id="gnu.both.asm.option.include.paths.1592126793" superClass="gnu.both.asm.option.include.paths" valueType="includePath"> + <option id="gnu.both.asm.option.include.paths.1592126793" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value="/home/haidong/googletest/googletest/include"/> diff --git a/PlaygroundCpp/Sources/Playground.cpp b/PlaygroundCpp/Sources/Playground.cpp index c737a3c..2bbbeb9 100644 --- a/PlaygroundCpp/Sources/Playground.cpp +++ b/PlaygroundCpp/Sources/Playground.cpp @@ -42,18 +42,10 @@ static int getLastDigit(long m, long n) { return sumFn - sumFm + 10; } } - -//TEST(FibPartialSumLastDigit, Five_Five) { -// ASSERT_EQ(getLastDigit(5, 5), 5); -//} -// //TEST(FibPartialSumLastDigit, Ten_200) { // ASSERT_EQ(getLastDigit(10, 200), 2); -//} -// //TEST(FibPartialSumLastDigit, One_2) { // ASSERT_EQ(getLastDigit(1, 2), 2); -//} int main() { long m, n; |