Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: cc/base/util.h

Issue 804373004: replace COMPILE_ASSERT with static_assert in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/animation/animation.cc ('k') | cc/output/geometry_binding.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_BASE_UTIL_H_ 5 #ifndef CC_BASE_UTIL_H_
6 #define CC_BASE_UTIL_H_ 6 #define CC_BASE_UTIL_H_
7 7
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 template <typename T> T RoundUp(T n, T mul) { 14 template <typename T> T RoundUp(T n, T mul) {
15 COMPILE_ASSERT(std::numeric_limits<T>::is_integer, type_must_be_integral); 15 static_assert(std::numeric_limits<T>::is_integer,
16 "T must be an integer type");
16 return (n > 0) ? ((n + mul - 1) / mul) * mul 17 return (n > 0) ? ((n + mul - 1) / mul) * mul
17 : (n / mul) * mul; 18 : (n / mul) * mul;
18 } 19 }
19 20
20 template <typename T> T RoundDown(T n, T mul) { 21 template <typename T> T RoundDown(T n, T mul) {
21 COMPILE_ASSERT(std::numeric_limits<T>::is_integer, type_must_be_integral); 22 static_assert(std::numeric_limits<T>::is_integer,
23 "T must be an integer type");
22 return (n > 0) ? (n / mul) * mul 24 return (n > 0) ? (n / mul) * mul
23 : (n == 0) ? 0 25 : (n == 0) ? 0
24 : ((n - mul + 1) / mul) * mul; 26 : ((n - mul + 1) / mul) * mul;
25 } 27 }
26 28
27 } // namespace cc 29 } // namespace cc
28 30
29 #endif // CC_BASE_UTIL_H_ 31 #endif // CC_BASE_UTIL_H_
OLDNEW
« no previous file with comments | « cc/animation/animation.cc ('k') | cc/output/geometry_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698