Start using <type_traits> and <utility> (C++11).

src/pdf/SkPDFMetadata.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFMetadata.h"
 #include "SkPDFTypes.h"
 
+#include <utility>
+
 #ifdef SK_PDF_GENERATE_PDFA
 #include "SkMD5.h"
 #endif
 
 static SkString pdf_date(const SkTime::DateTime& dt) {
     int timeZoneMinutes = SkToInt(dt.fTimeZoneMinutes);
     char timezoneSign = timeZoneMinutes >= 0 ? '+' : '-';
     int timeZoneHours = SkTAbs(timeZoneMinutes) / 60;
     timeZoneMinutes = SkTAbs(timeZoneMinutes) % 60;
     return SkStringPrintf(
@@ skipping 89 matching lines @@
     length = _vscprintf(format, args);
     va_end(args);
 
     SkString string((size_t)length);
     va_start(args, format);
     SkDEBUGCODE(int check = ) _vsnprintf_s(string.writable_str(), length + 1,
                                            _TRUNCATE, format, args);
     va_end(args);
     SkASSERT(check == length);
     SkASSERT(string[length] == '\0');
-    return skstd::move(string);
+    return std::move(string);
 #else  // C99/C++11 standard vsnprintf
     // TODO: When all compilers support this, remove windows-specific code.
     va_list args;
     va_start(args, format);
     char buffer[1024];
     int length = vsnprintf(buffer, sizeof(buffer), format, args);
     va_end(args);
     if (length < 0) {
         return SkString();
     }
     if (length < (int)sizeof(buffer)) {
         return SkString(buffer, length);
     }
     SkString string((size_t)length);
     va_start(args, format);
     SkDEBUGCODE(int check = )
             vsnprintf(string.writable_str(), length + 1, format, args);
     va_end(args);
     SkASSERT(check == length);
     SkASSERT(string[length] == '\0');
-    return skstd::move(string);
+    return std::move(string);
 #endif
 }
 
 static const SkString get(const SkTArray<SkDocument::Attribute>& info,
                           const char* key) {
     for (const auto& keyValue : info) {
         if (keyValue.fKey.equals(key)) {
             return keyValue.fValue;
         }
     }
@@ skipping 26 matching lines @@
     HEXIFY(data, ptr, gHex, 6);
     SkASSERT(ptr == buffer + 36);
     SkASSERT(data == uuid.fData + 16);
     return SkString(buffer, 36);
 }
 #undef HEXIFY
 
 namespace {
 class PDFXMLObject final : public SkPDFObject {
 public:
-    PDFXMLObject(SkString xml) : fXML(skstd::move(xml)) {}
+    PDFXMLObject(SkString xml) : fXML(std::move(xml)) {}
     void emitObject(SkWStream* stream,
                     const SkPDFObjNumMap& omap,
                     const SkPDFSubstituteMap& smap) const override {
         SkPDFDict dict("Metadata");
         dict.insertName("Subtype", "XML");
         dict.insertInt("Length", fXML.size());
         dict.emitObject(stream, omap, smap);
         static const char streamBegin[] = " stream\n";
         stream->write(streamBegin, strlen(streamBegin));
         // Do not compress this.  The standard requires that a
@@ skipping 52 matching lines @@
             *out++ = input[i];
         }
     }
     if (after) {
         strncpy(out, after, afterLen);
         out += afterLen;
     }
     // Validate that we haven't written outside of our string.
     SkASSERT(out == &output.writable_str()[output.size()]);
     *out = '\0';
-    return skstd::move(output);
+    return std::move(output);
 }
 
 SkPDFObject* SkPDFMetadata::createXMPObject(const UUID& doc,
                                             const UUID& instance) const {
     static const char templateString[] =
             "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n"
             "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\"\n"
             " x:xmptk=\"Adobe XMP Core 5.4-c005 78.147326, "
             "2012/08/23-13:03:03\">\n"
             "<rdf:RDF "
@@ skipping 69 matching lines @@
     SkString instanceID = uuid_to_string(instance);
     SkASSERT(0 == count_xml_escape_size(instanceID));
     return new PDFXMLObject(sk_string_printf(
             templateString, modificationDate.c_str(), creationDate.c_str(),
             metadataDate.c_str(), creator.c_str(), title.c_str(),
             subject.c_str(), author.c_str(), keywords1.c_str(),
             documentID.c_str(), instanceID.c_str(), keywords2.c_str()));
 }
 
 #endif  // SK_PDF_GENERATE_PDFA