[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ffccd2ef76efef7434741f8851cd9e29e524b512
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 21:18:50 2010 +0000

            Addressing issues found by style bot.
    
            * wtf/ValueCheck.h: Renamed header guard to match final file name.
    
            * wtf/Vector.h: (WTF::::checkConsistency): Remove braces around a one-line clause.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 68354da..796278f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-10  Alexey Proskuryakov  <ap at apple.com>
+
+        Addressing issues found by style bot.
+
+        * wtf/ValueCheck.h: Renamed header guard to match final file name.
+
+        * wtf/Vector.h: (WTF::::checkConsistency): Remove braces around a one-line clause.
+
 2010-02-09  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/JavaScriptCore/wtf/ValueCheck.h b/JavaScriptCore/wtf/ValueCheck.h
index 2ab6925..cd321b8 100644
--- a/JavaScriptCore/wtf/ValueCheck.h
+++ b/JavaScriptCore/wtf/ValueCheck.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ValueTraits_h
-#define ValueTraits_h
+#ifndef ValueCheck_h
+#define ValueCheck_h
 
 // For malloc_size and _msize.
 #if OS(DARWIN)
@@ -61,4 +61,4 @@ template<typename P> struct ValueCheck<P*> {
 
 }
 
-#endif // ValueTraits_h
+#endif // ValueCheck_h
diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h
index ad0e5d7..81ea321 100644
--- a/JavaScriptCore/wtf/Vector.h
+++ b/JavaScriptCore/wtf/Vector.h
@@ -993,9 +993,8 @@ namespace WTF {
     inline void Vector<T, inlineCapacity>::checkConsistency()
     {
 #if !ASSERT_DISABLED
-        for (size_t i = 0; i < size(); ++i) {
+        for (size_t i = 0; i < size(); ++i)
             ValueCheck<T>::checkConsistency(at(i));
-        }
 #endif
     }
 

-- 
WebKit Debian packaging