| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef _xmlbuilder_h_ | 11 #ifndef _xmlbuilder_h_ |
| 12 #define _xmlbuilder_h_ | 12 #define _xmlbuilder_h_ |
| 13 | 13 |
| 14 #include <memory> |
| 14 #include <string> | 15 #include <string> |
| 15 #include <vector> | 16 #include <vector> |
| 16 #include "webrtc/libjingle/xmllite/xmlparser.h" | 17 #include "webrtc/libjingle/xmllite/xmlparser.h" |
| 17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" |
| 18 | 19 |
| 19 #include "expat.h" | 20 #include "expat.h" |
| 20 | 21 |
| 21 namespace buzz { | 22 namespace buzz { |
| 22 | 23 |
| 23 class XmlElement; | 24 class XmlElement; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 41 void Reset(); | 42 void Reset(); |
| 42 | 43 |
| 43 // Take ownership of the built element; second call returns NULL | 44 // Take ownership of the built element; second call returns NULL |
| 44 XmlElement * CreateElement(); | 45 XmlElement * CreateElement(); |
| 45 | 46 |
| 46 // Peek at the built element without taking ownership | 47 // Peek at the built element without taking ownership |
| 47 XmlElement * BuiltElement(); | 48 XmlElement * BuiltElement(); |
| 48 | 49 |
| 49 private: | 50 private: |
| 50 XmlElement * pelCurrent_; | 51 XmlElement * pelCurrent_; |
| 51 rtc::scoped_ptr<XmlElement> pelRoot_; | 52 std::unique_ptr<XmlElement> pelRoot_; |
| 52 rtc::scoped_ptr<std::vector<XmlElement*> > pvParents_; | 53 std::unique_ptr<std::vector<XmlElement*> > pvParents_; |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 } | 56 } |
| 56 | 57 |
| 57 #endif | 58 #endif |
| OLD | NEW |