merge

3 files changed, 7 insertions, 10 deletions

diff --git a/googletest/samples/sample4.cc b/googletest/samples/sample4.cc
index 724bcb54..b0ee6093 100644
--- a/googletest/samples/sample4.cc
+++ b/googletest/samples/sample4.cc
@@ -40,13 +40,13 @@ int Counter::Increment() {
 
 // Returns the current counter value, and decrements it.
 // counter can not be less than 0, return 0 in this case
-  int Counter::Decrement() {
-    if (counter_==0){
-      return counter_;
-    }
-    else
-      return counter_--;
+int Counter::Decrement() {
+  if (counter_ == 0) {
+    return counter_;
+  } else  {
+    return counter_--;
   }
+}
 
 // Prints the current counter value to STDOUT.
 void Counter::Print() const {
diff --git a/googletest/samples/sample4.h b/googletest/samples/sample4.h
index a9679ff1..e256f406 100644
--- a/googletest/samples/sample4.h
+++ b/googletest/samples/sample4.h
@@ -43,10 +43,9 @@ class Counter {
   // Returns the current counter value, and increments it.
   int Increment();
 
-// Returns the current counter value, and decrements it.
+  // Returns the current counter value, and decrements it.
   int Decrement();
 
-
   // Prints the current counter value to STDOUT.
   void Print() const;
 };
diff --git a/googletest/samples/sample4_unittest.cc b/googletest/samples/sample4_unittest.cc
index ee655c66..d5144c0d 100644
--- a/googletest/samples/sample4_unittest.cc
+++ b/googletest/samples/sample4_unittest.cc
@@ -40,7 +40,6 @@ TEST(Counter, Increment) {
   // Test that counter 0 returns 0
   EXPECT_EQ(0, c.Decrement());
 
-
   // EXPECT_EQ() evaluates its arguments exactly once, so they
   // can have side effects.
 
@@ -49,7 +48,6 @@ TEST(Counter, Increment) {
   EXPECT_EQ(2, c.Increment());
 
   EXPECT_EQ(3, c.Decrement());
-
 }
 
 }  // namespace