commit 09dd90fcc7f7ab419e8e51b7037e5bffd10aefc0
author Vignesh Venkatasubramanian <vigneshv@google.com> Wed Jun 12 11:23:35 2013 -0700
committer Vignesh Venkatasubramanian <vigneshv@google.com> Wed Jun 12 11:23:35 2013 -0700
tree 58c7e406b6e95725e903982f6cc876a821fff449
parent 54ca052b1c90171eb36210ed3718d80934e78cd9

Fully qualifiying usage of std::string

Replacing "using std::string" with fully qualified namespace on
each occurance of string in sample_muxer_metadata.cc and
webvttparser.cc.

Also fixing a formatting nit in mkvwriteeofreader.cpp

Change-Id: Icf713f9e489fbdc9af14e83d0cb7ba2e89e65ab4

sample_muxer_metadata.cc

diff --git a/sample_muxer_metadata.cc b/sample_muxer_metadata.cc
index c3a2e3f..212f9f0 100644
--- a/sample_muxer_metadata.cc
+++ b/sample_muxer_metadata.cc
@@ -2,8 +2,6 @@
 #include <string>
 #include "vttreader.h"
 
-using std::string;
-
 SampleMuxerMetadata::SampleMuxerMetadata() : segment_(NULL) {
 }
 
@@ -295,7 +293,7 @@
   }
 }
 
-void SampleMuxerMetadata::MakeFrame(const cue_t& c, string* pf) {
+void SampleMuxerMetadata::MakeFrame(const cue_t& c, std::string* pf) {
   pf->clear();
   WriteCueIdentifier(c.identifier, pf);
   WriteCueSettings(c.settings, pf);
@@ -303,15 +301,15 @@
 }
 
 void SampleMuxerMetadata::WriteCueIdentifier(
-    const string& identifier,
-    string* pf) {
+    const std::string& identifier,
+    std::string* pf) {
   pf->append(identifier);
   pf->push_back('\x0A');  // LF
 }
 
 void SampleMuxerMetadata::WriteCueSettings(
     const cue_t::settings_t& settings,
-    string* pf) {
+    std::string* pf) {
   if (settings.empty()) {
     pf->push_back('\x0A');  // LF
     return;
@@ -340,14 +338,14 @@
 
 void SampleMuxerMetadata::WriteCuePayload(
     const cue_t::payload_t& payload,
-    string* pf) {
+    std::string* pf) {
   typedef cue_t::payload_t::const_iterator iter_t;
 
   iter_t i = payload.begin();
   const iter_t j = payload.end();
 
   while (i != j) {
-    const string& line = *i++;
+    const std::string& line = *i++;
     pf->append(line);
     pf->push_back('\x0A');  // LF
   }
@@ -370,7 +368,7 @@
   // Metadata blocks always specify the block duration.
   const mkvmuxer::int64 duration_ns = stop_ns - start_ns;
 
-  string frame;
+  std::string frame;
   MakeFrame(cue, &frame);
 
   typedef const mkvmuxer::uint8* data_t;