//===- lld/ReaderWriter/YamlContext.h - object used in YAML I/O context ---===//
//
//                             The LLVM Linker
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//

#ifndef LLD_READER_WRITER_YAML_CONTEXT_H
#define LLD_READER_WRITER_YAML_CONTEXT_H

#include "lld/Core/LLVM.h"
#include <functional>
#include <memory>
#include <vector>

namespace lld {
class File;
class LinkingContext;
namespace mach_o {
namespace normalized {
struct NormalizedFile;
}
}

using lld::mach_o::normalized::NormalizedFile;

/// When YAML I/O is used in lld, the yaml context always holds a YamlContext
/// object.  We need to support hetergenous yaml documents which each require
/// different context info.  This struct supports all clients.
struct YamlContext {
  const LinkingContext *_ctx = nullptr;
  const Registry *_registry = nullptr;
  File *_file = nullptr;
  NormalizedFile *_normalizeMachOFile = nullptr;
  StringRef _path;
};

} // end namespace lld

#endif // LLD_READER_WRITER_YAML_CONTEXT_H

//===- lld/ReaderWriter/YamlContext.h - object used in YAML I/O context ---===//
//
//                             The LLVM Linker
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//

#ifndef LLD_READER_WRITER_YAML_CONTEXT_H
#define LLD_READER_WRITER_YAML_CONTEXT_H

#include "lld/Core/LLVM.h"
#include <functional>
#include <memory>
#include <vector>

namespace lld {
class File;
class LinkingContext;
namespace mach_o {
namespace normalized {
struct NormalizedFile;
}
}

using lld::mach_o::normalized::NormalizedFile;

/// When YAML I/O is used in lld, the yaml context always holds a YamlContext
/// object.  We need to support hetergenous yaml documents which each require
/// different context info.  This struct supports all clients.
struct YamlContext {
  YamlContext()
      : _ctx(nullptr), _registry(nullptr), _file(nullptr),
        _normalizeMachOFile(nullptr) {}

  const LinkingContext *_ctx;
  const Registry *_registry;
  File *_file;
  NormalizedFile *_normalizeMachOFile;
  StringRef _path;
};

} // end namespace lld

#endif // LLD_READER_WRITER_YAML_CONTEXT_H

--- 
+++ 
@@ -30,14 +30,10 @@
 /// object.  We need to support hetergenous yaml documents which each require
 /// different context info.  This struct supports all clients.
 struct YamlContext {
-  YamlContext()
-      : _ctx(nullptr), _registry(nullptr), _file(nullptr),
-        _normalizeMachOFile(nullptr) {}
-
-  const LinkingContext *_ctx;
-  const Registry *_registry;
-  File *_file;
-  NormalizedFile *_normalizeMachOFile;
+  const LinkingContext *_ctx = nullptr;
+  const Registry *_registry = nullptr;
+  File *_file = nullptr;
+  NormalizedFile *_normalizeMachOFile = nullptr;
   StringRef _path;
 };
 
Use C++11 non-static member initialization.

git-svn-id: f6089bf0e6284f307027cef4f64114ee9ebb0424@234648 91177308-0d34-0410-b5e6-96231b3b80d8
