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

Side by Side Diff: net/quic/crypto/crypto_handshake_message.cc

Issue 826973002: replace COMPILE_ASSERT with static_assert in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply fixups Created 5 years, 11 months 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 | « net/quic/crypto/crypto_handshake.h ('k') | net/quic/crypto/crypto_server_test.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "net/quic/crypto/crypto_handshake_message.h" 5 #include "net/quic/crypto/crypto_handshake_message.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "net/quic/crypto/crypto_framer.h" 9 #include "net/quic/crypto/crypto_framer.h"
10 #include "net/quic/crypto/crypto_protocol.h" 10 #include "net/quic/crypto/crypto_protocol.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return *serialized_.get(); 58 return *serialized_.get();
59 } 59 }
60 60
61 void CryptoHandshakeMessage::MarkDirty() { 61 void CryptoHandshakeMessage::MarkDirty() {
62 serialized_.reset(); 62 serialized_.reset();
63 } 63 }
64 64
65 void CryptoHandshakeMessage::SetTaglist(QuicTag tag, ...) { 65 void CryptoHandshakeMessage::SetTaglist(QuicTag tag, ...) {
66 // Warning, if sizeof(QuicTag) > sizeof(int) then this function will break 66 // Warning, if sizeof(QuicTag) > sizeof(int) then this function will break
67 // because the terminating 0 will only be promoted to int. 67 // because the terminating 0 will only be promoted to int.
68 COMPILE_ASSERT(sizeof(QuicTag) <= sizeof(int), 68 static_assert(sizeof(QuicTag) <= sizeof(int),
69 crypto_tag_may_not_be_larger_than_int_or_varargs_will_break); 69 "crypto tag may not be larger than int or varargs will break");
70 70
71 vector<QuicTag> tags; 71 vector<QuicTag> tags;
72 va_list ap; 72 va_list ap;
73 73
74 va_start(ap, tag); 74 va_start(ap, tag);
75 for (;;) { 75 for (;;) {
76 QuicTag list_item = va_arg(ap, QuicTag); 76 QuicTag list_item = va_arg(ap, QuicTag);
77 if (list_item == 0) { 77 if (list_item == 0) {
78 break; 78 break;
79 } 79 }
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 ret += "0x" + base::HexEncode(it->second.data(), it->second.size()); 314 ret += "0x" + base::HexEncode(it->second.data(), it->second.size());
315 } 315 }
316 ret += "\n"; 316 ret += "\n";
317 } 317 }
318 --indent; 318 --indent;
319 ret += string(2 * indent, ' ') + ">"; 319 ret += string(2 * indent, ' ') + ">";
320 return ret; 320 return ret;
321 } 321 }
322 322
323 } // namespace net 323 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/crypto_handshake.h ('k') | net/quic/crypto/crypto_server_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698