Bug 1047483 - Fix Windows non-unified build bustage again.
authorAndrew McCreight <amccreight@mozilla.com>
Wed, 08 Oct 2014 12:39:25 -0700
changeset 209387 bb693abe8de06daec3e57643f23d5c711d510a79
parent 209386 7fd338bf0e127c4dc21b51879cd8e10630d033b4
child 209388 3bd866e3607b51c6d0d1514854cfa7bfe149a18b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1047483
milestone35.0a1
Bug 1047483 - Fix Windows non-unified build bustage again. CLOSED TREE a=RyanVM
dom/archivereader/ArchiveZipFile.cpp
dom/archivereader/ArchiveZipFile.h
--- a/dom/archivereader/ArchiveZipFile.cpp
+++ b/dom/archivereader/ArchiveZipFile.cpp
@@ -397,17 +397,17 @@ ArchiveZipFileImpl::Traverse(nsCycleColl
   ArchiveZipFileImpl* tmp = this;
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mArchiveReader);
 }
 
 already_AddRefed<mozilla::dom::FileImpl>
 ArchiveZipFileImpl::CreateSlice(uint64_t aStart,
                                 uint64_t aLength,
                                 const nsAString& aContentType,
-                                ErrorResult& aRv)
+                                mozilla::ErrorResult& aRv)
 {
   nsRefPtr<FileImpl> impl =
     new ArchiveZipFileImpl(mFilename, mContentType, aStart, mLength, mCentral,
                            mArchiveReader);
   return impl.forget();
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(ArchiveZipFileImpl, FileImpl)
--- a/dom/archivereader/ArchiveZipFile.h
+++ b/dom/archivereader/ArchiveZipFile.h
@@ -69,17 +69,17 @@ public:
 protected:
   virtual ~ArchiveZipFileImpl()
   {
     MOZ_COUNT_DTOR(ArchiveZipFileImpl);
   }
 
   virtual already_AddRefed<FileImpl>
   CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType,
-              ErrorResult& aRv) MOZ_OVERRIDE;
+              mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
 private: // Data
   ZipCentral mCentral;
   nsRefPtr<ArchiveReader> mArchiveReader;
 
   nsString mFilename;
 };