commit 400ce5523aead39627e01bb532e9b29372ac9028
author Fares Alhassen <falhassen@google.com> Fri Jan 13 14:36:32 2017 -0800
committer sandovad <sandovad@google.com> Tue Sep 03 09:55:30 2019 -0700
tree 6f0aad79e9e4d449768d89f1e8d4637b13bcf062
parent da0bacd76b3f7f7ea376722ab314b76bc5fbdff2

Internal change

PiperOrigin-RevId: 144486264
Change-Id: I73ce0404a14a9270b35d369ab47b91ca3a9f503e

libutil/TrackModifier.cpp

diff --git a/libutil/TrackModifier.cpp b/libutil/TrackModifier.cpp
index 2fdae7e..78593a9 100644
--- a/libutil/TrackModifier.cpp
+++ b/libutil/TrackModifier.cpp
@@ -70,7 +70,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 void
-TrackModifier::dump( ostream& out, const string& xind )
+TrackModifier::dump( std::ostream& out, const string& xind )
 {
     const uint32_t w = 14;
     const string eq = " = ";

libutil/TrackModifier.h

diff --git a/libutil/TrackModifier.h b/libutil/TrackModifier.h
index 798a061..21f40fa 100644
--- a/libutil/TrackModifier.h
+++ b/libutil/TrackModifier.h
@@ -138,7 +138,7 @@
     bool hasUserDataName() const;
     void removeUserDataName();
 
-    void dump( ostream&, const string& );
+    void dump( std::ostream&, const string& );
 
 private:
     void fetch();

src/log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index 26eea6b..41d6aef 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -430,7 +430,7 @@
     {
         // ios_base::ate means at end.  With out this desc
         // gets overwritten with each << operation
-        ostringstream oneLine(desc ? desc : "",ios_base::ate);
+        ostringstream oneLine(desc ? desc : "", std::ios_base::ate);
 
         // Append the byte offset this line starts with as
         // an 8 character, leading 0, hex number.  Leave the
@@ -531,4 +531,3 @@
         mp4v2::impl::log.errorf( "%s: failed", __FUNCTION__ );
     }
 }
-