commit 017881065990b83be71fb54c92bf2a22428614ef
author sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Feb 08 03:18:03 2014 +0000
committer sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Feb 08 03:18:03 2014 +0000
tree 5d90018d55161d96fa6a261f6cb3f41340f147f5
parent bfc26dcc10c959c2e4afed573daa35eeafe79fec

Don't use LOG() in callback.h

Because chromium is compiled with a different version of logging macros
defined in logging.h that header cannot be used in headers that can
also included from chromium code. Removed LOG_F(LS_WARNING) from
callback.h . That issue would block this code from being rolled in
chromium.

R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8279004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5507 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/callback.h

diff --git a/talk/base/callback.h b/talk/base/callback.h
index e772768..11fbf86 100644
--- a/talk/base/callback.h
+++ b/talk/base/callback.h
@@ -93,10 +93,8 @@
   template <class T> Callback0(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()() {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run();
   }
   bool empty() const { return !helper_; }
@@ -125,10 +123,8 @@
   template <class T> Callback1(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()(P1 p1) {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run(p1);
   }
   bool empty() const { return !helper_; }
@@ -158,10 +154,8 @@
   template <class T> Callback2(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()(P1 p1, P2 p2) {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run(p1, p2);
   }
   bool empty() const { return !helper_; }
@@ -192,10 +186,8 @@
   template <class T> Callback3(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()(P1 p1, P2 p2, P3 p3) {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run(p1, p2, p3);
   }
   bool empty() const { return !helper_; }
@@ -227,10 +219,8 @@
   template <class T> Callback4(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()(P1 p1, P2 p2, P3 p3, P4 p4) {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run(p1, p2, p3, p4);
   }
   bool empty() const { return !helper_; }
@@ -263,10 +253,8 @@
   template <class T> Callback5(const T& functor)
       : helper_(new RefCountedObject< HelperImpl<T> >(functor)) {}
   R operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) {
-    if (empty()) {
-      LOG_F(LS_WARNING) << "Tried to execute an empty callback.";
+    if (empty())
       return R();
-    }
     return helper_->Run(p1, p2, p3, p4, p5);
   }
   bool empty() const { return !helper_; }
@@ -287,5 +275,4 @@
 };
 }  // namespace talk_base
 
-
 #endif  // TALK_BASE_CALLBACK_H_