| commit | 774b3d38a4a0f1a8ec08972a3c543cb5d607ce13 | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed May 21 21:18:46 2014 +0000 |
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed May 21 21:18:46 2014 +0000 |
| tree | 08a348c4e84d3377b528ea7a81646bdce00e5465 | |
| parent | 11e96c736207147b6c79963073f89112a8dbefb4 [diff] [blame] |
Switch to using base/constructormagic.h and remove system_wrappers/interface/constructor_magic.h. Same as https://webrtc-codereview.appspot.com/19519004. The issue in http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Linux... is solved by this change http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libjingle/libjing... (tested locally). BUG=3380 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/17619005 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6218 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/tools/simple_command_line_parser.h b/tools/simple_command_line_parser.h index 348e8c3..6bb3313 100644 --- a/tools/simple_command_line_parser.h +++ b/tools/simple_command_line_parser.h
@@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/test/testsupport/gtest_prod_util.h" // This is a very basic command line parsing class. We pass the command line