Followup for bug 1073712: Don't include a C header inside namespace mozilla on a CLOSED TREE
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 09 Oct 2014 14:31:10 +0900
changeset 232742 a5a91bfe00138ca47c02b5aef42043f763625ce3
parent 232741 981994dec186511c9bdb4daceea90f6ba6312665
child 232743 48ba505ebcbd8dbde9b7b3815c475842d0dfc678
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1073712
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Followup for bug 1073712: Don't include a C header inside namespace mozilla on a CLOSED TREE
content/media/webm/WebMReader.cpp
--- a/content/media/webm/WebMReader.cpp
+++ b/content/media/webm/WebMReader.cpp
@@ -26,21 +26,16 @@ using mozilla::NesteggPacketHolder;
 template <>
 class nsAutoRefTraits<NesteggPacketHolder> :
   public nsPointerRefTraits<NesteggPacketHolder>
 {
 public:
   static void Release(NesteggPacketHolder* aHolder) { delete aHolder; }
 };
 
-namespace mozilla {
-
-using namespace gfx;
-using namespace layers;
-
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
 #ifdef PR_LOGGING
 #include "prprf.h"
 extern PRLogModuleInfo* gMediaDecoderLog;
 PRLogModuleInfo* gNesteggLog;
 #define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
@@ -49,16 +44,21 @@ PRLogModuleInfo* gNesteggLog;
 #else
 #define SEEK_LOG(type, msg)
 #endif
 #else
 #define LOG(type, msg)
 #define SEEK_LOG(type, msg)
 #endif
 
+namespace mozilla {
+
+using namespace gfx;
+using namespace layers;
+
 static const unsigned NS_PER_USEC = 1000;
 static const double NS_PER_S = 1e9;
 
 // Functions for reading and seeking using MediaResource required for
 // nestegg_io. The 'user data' passed to these functions is the
 // decoder from which the media resource is obtained.
 static int webm_read(void *aBuffer, size_t aLength, void *aUserData)
 {