commit 2fa7f79094bfa283e0ff2b086be511e65c24c69e
author mcasas@webrtc.org <mcasas@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 21 11:07:29 2014 +0000
committer mcasas@webrtc.org <mcasas@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 21 11:07:29 2014 +0000
tree 48c779e4c4a7d44beacd696f146cfecaf7d69459
parent c2213b6a0ffe6192ab1f6bc43f0cd2d888d88faf

Revert 6202 "Switch to using base/constructormagic.h and remove ..."

> Switch to using base/constructormagic.h and remove system_wrappers/interface/constructor_magic.h.
> 
> BUG=N/A
> R=andrew@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/19519004

TBR=henrike@webrtc.org

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

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

webrtc/modules/audio_coding/neteq4/neteq_impl.h

diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.h b/webrtc/modules/audio_coding/neteq4/neteq_impl.h
index 9b155fe..b8139ac 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.h
+++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.h
@@ -13,7 +13,6 @@
 
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
 #include "webrtc/modules/audio_coding/neteq4/defines.h"
 #include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
@@ -21,6 +20,7 @@
 #include "webrtc/modules/audio_coding/neteq4/random_vector.h"
 #include "webrtc/modules/audio_coding/neteq4/rtcp.h"
 #include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/thread_annotations.h"
 #include "webrtc/typedefs.h"