1 files changed, 14 insertions, 9 deletions
diff --git a/include/llvm/Transforms/Utils/SymbolRewriter.h b/include/llvm/Transforms/Utils/SymbolRewriter.h
index ff995173e126..93658989fba5 100644
--- a/include/llvm/Transforms/Utils/SymbolRewriter.h
+++ b/include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -36,18 +36,24 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
 #include <list>
+#include <memory>
+#include <string>
 
 namespace llvm {
+
 class MemoryBuffer;
 
 namespace yaml {
+
 class KeyValueNode;
 class MappingNode;
 class ScalarNode;
 class Stream;
-}
+
+} // end namespace yaml
 
 namespace SymbolRewriter {
+
 /// The basic entity representing a rewrite operation.  It serves as the base
 /// class for any rewrite descriptor.  It has a certain set of specializations
 /// which describe a particular rewrite.
@@ -60,11 +66,6 @@ namespace SymbolRewriter {
 /// select the symbols to rewrite.  This descriptor list is passed to the
 /// SymbolRewriter pass.
 class RewriteDescriptor {
-  RewriteDescriptor(const RewriteDescriptor &) = delete;
-
-  const RewriteDescriptor &
-  operator=(const RewriteDescriptor &) = delete;
-
 public:
   enum class Type {
     Invalid,        /// invalid
@@ -73,7 +74,9 @@ public:
     NamedAlias,     /// named alias - descriptor rewrites a global alias
   };
 
-  virtual ~RewriteDescriptor() {}
+  RewriteDescriptor(const RewriteDescriptor &) = delete;
+  RewriteDescriptor &operator=(const RewriteDescriptor &) = delete;
+  virtual ~RewriteDescriptor() = default;
 
   Type getType() const { return Kind; }
 
@@ -108,7 +111,8 @@ private:
                                          yaml::MappingNode *V,
                                          RewriteDescriptorList *DL);
 };
-}
+
+} // end namespace SymbolRewriter
 
 ModulePass *createRewriteSymbolsPass();
 ModulePass *createRewriteSymbolsPass(SymbolRewriter::RewriteDescriptorList &);
@@ -130,6 +134,7 @@ private:
 
   SymbolRewriter::RewriteDescriptorList Descriptors;  
 };
-}
+
+} // end namespace llvm
 
 #endif //LLVM_TRANSFORMS_UTILS_SYMBOLREWRITER_H