diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:05:13 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:05:13 +0000 |
| commit | 19c5072ca6d1776ae1d03caaed67dc6dccc0bfe5 (patch) | |
| tree | 041ae5b304ebff7035d9ce2c5c78be5ca32ed0df /net/tools | |
| parent | 01d2b7eaf54a67e9cbcb1dbb563deb1229e5960e (diff) | |
| download | chromium_src-19c5072ca6d1776ae1d03caaed67dc6dccc0bfe5.zip chromium_src-19c5072ca6d1776ae1d03caaed67dc6dccc0bfe5.tar.gz chromium_src-19c5072ca6d1776ae1d03caaed67dc6dccc0bfe5.tar.bz2 | |
Revert 204313 "net_watcher does not build in Ubuntu 13.04"
broke compile on Google Chrome Linux bot:
../../net/tools/net_watcher/net_watcher.cc:133:error: expected [error|warning|ignored] after '#pragma GCC diagnostic'
../../net/tools/net_watcher/net_watcher.cc:207:error: expected [error|warning|ignored] after '#pragma GCC diagnostic'
> net_watcher does not build in Ubuntu 13.04
>
> This is due to a deprecation warning in glib, which affects glib 2.36 onward. Added a pragma to suppress deprecation warnings.
> BUG=245658
>
> Review URL: https://chromiumcodereview.appspot.com/15994010
TBR=yael.aharon@intel.com
Review URL: https://codereview.chromium.org/16404004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/net_watcher/net_watcher.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index 479ed46..426fea17 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -127,13 +127,6 @@ class NetWatcher : } // namespace -// From glib version 2.36 onwards, g_type_init is implicitly called and it is -// deprecated. -#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - int main(int argc, char* argv[]) { #if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool pool; @@ -202,7 +195,3 @@ int main(int argc, char* argv[]) { return 0; } - -#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) -#pragma GCC diagnostic pop -#endif |