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

Side by Side Diff: third_party/libjingle/overrides/talk/base/logging.h

Issue 2657005: Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: added the macro back Created 10 years, 6 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/url_request/url_request_job_manager.h ('k') | tools/memory_watcher/call_stack.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004--2005, Google Inc. 3 * Copyright 2004--2005, Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 // Flags for formatting options 229 // Flags for formatting options
230 static bool thread_, timestamp_; 230 static bool thread_, timestamp_;
231 231
232 // The timestamp at which logging started. 232 // The timestamp at which logging started.
233 static uint32 start_; 233 static uint32 start_;
234 234
235 // are we in diagnostic mode (as defined by the app)? 235 // are we in diagnostic mode (as defined by the app)?
236 static bool is_diagnostic_mode_; 236 static bool is_diagnostic_mode_;
237 237
238 DISALLOW_EVIL_CONSTRUCTORS(LogMessage); 238 DISALLOW_COPY_AND_ASSIGN(LogMessage);
239 }; 239 };
240 240
241 ////////////////////////////////////////////////////////////////////// 241 //////////////////////////////////////////////////////////////////////
242 // Logging Helpers 242 // Logging Helpers
243 ////////////////////////////////////////////////////////////////////// 243 //////////////////////////////////////////////////////////////////////
244 244
245 class LogMultilineState { 245 class LogMultilineState {
246 public: 246 public:
247 size_t unprintable_count_[2]; 247 size_t unprintable_count_[2];
248 LogMultilineState() { 248 LogMultilineState() {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 LOG_ERR_EX(sev, err) 377 LOG_ERR_EX(sev, err)
378 378
379 // TODO(?): Add an "assert" wrapper that logs in the same manner. 379 // TODO(?): Add an "assert" wrapper that logs in the same manner.
380 380
381 #endif // LOG 381 #endif // LOG
382 #endif // defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS) 382 #endif // defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS)
383 383
384 } // namespace talk_base 384 } // namespace talk_base
385 385
386 #endif // TALK_BASE_LOGGING_H_ 386 #endif // TALK_BASE_LOGGING_H_
OLDNEW
« no previous file with comments | « net/url_request/url_request_job_manager.h ('k') | tools/memory_watcher/call_stack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698