Merge branch 'master' of github.com:soulmachine/leetcode

soulmachine · soulmachine · commit 26d18596f754 · 2014-01-07T13:40:27.000+08:00
diff --git a/C++/chapSorting.tex b/C++/chapSorting.tex
@@ -62,14 +62,14 @@ \subsubsection{代码}
     ListNode *mergeTwoLists(ListNode *l1, ListNode *l2) {
         if (l1 == nullptr) return l2;
         if (l2 == nullptr) return l1;
-        ListNode h(-1);
-        ListNode *p = &h;
+        ListNode dummy(-1);
+        ListNode *p = &dummy;
         for (; l1 != nullptr && l2 != nullptr; p = p->next) {
             if (l1->val > l2->val) { p->next = l2; l2 = l2->next; }
             else { p->next = l1; l1 = l1->next; }
         }
         p->next = l1 != nullptr ? l1 : l2;
-        return h.next;
+        return dummy.next;
     }
 };
 \end{Code}
