Commit f7170d17 authored by Duncan P. N. Exon Smith's avatar Duncan P. N. Exon Smith
Browse files

clang/Modules: Move Serialization/Module.{h,cpp} to ModuleFile, NFC 

Remove some cognitive load by renaming clang/Serialization/Module.h to
clang/Serialization/ModuleFile.h, since it declares the ModuleFile
class.  This also makes editing a bit easier, since the basename of the
file no long conflicts with clang/Basic/Module.h, which declares the
Module class.  Also move lib/Serialization/Module.cpp to
lib/Serialization/ModuleFile.cpp.
parent 0b58b80e

clang/include/clang/Serialization/ASTReader.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "clang/Sema/IdentifierResolver.h"

#include "clang/Serialization/ASTBitCodes.h"

#include "clang/Serialization/ContinuousRangeMap.h"

#include "clang/Serialization/Module.h"

#include "clang/Serialization/ModuleFile.h"

#include "clang/Serialization/ModuleFileExtension.h"

#include "clang/Serialization/ModuleManager.h"

#include "llvm/ADT/APFloat.h"

clang/include/clang/Serialization/Module.h→clang/include/clang/Serialization/ModuleFile.h

+4 −4
Original line number Diff line number Diff line 
//===- Module.h - Module description ----------------------------*- C++ -*-===//

//===- ModuleFile.h - Module file description -------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@ 
//

//===----------------------------------------------------------------------===//



#ifndef LLVM_CLANG_SERIALIZATION_MODULE_H

#define LLVM_CLANG_SERIALIZATION_MODULE_H

#ifndef LLVM_CLANG_SERIALIZATION_MODULEFILE_H

#define LLVM_CLANG_SERIALIZATION_MODULEFILE_H



#include "clang/Basic/Module.h"

#include "clang/Basic/SourceLocation.h"
@@ -489,4 +489,4 @@ public: 


} // namespace clang



#endif // LLVM_CLANG_SERIALIZATION_MODULE_H
 
#endif // LLVM_CLANG_SERIALIZATION_MODULEFILE_H

clang/include/clang/Serialization/ModuleManager.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "clang/Basic/LLVM.h"

#include "clang/Basic/Module.h"

#include "clang/Basic/SourceLocation.h"

#include "clang/Serialization/Module.h"

#include "clang/Serialization/ModuleFile.h"

#include "llvm/ADT/DenseMap.h"

#include "llvm/ADT/IntrusiveRefCntPtr.h"

#include "llvm/ADT/STLExtras.h"

clang/lib/Frontend/ASTUnit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include "clang/Serialization/ASTWriter.h"

#include "clang/Serialization/ContinuousRangeMap.h"

#include "clang/Serialization/InMemoryModuleCache.h"

#include "clang/Serialization/Module.h"

#include "clang/Serialization/ModuleFile.h"

#include "clang/Serialization/PCHContainerOperations.h"

#include "llvm/ADT/ArrayRef.h"

#include "llvm/ADT/DenseMap.h"

clang/lib/Frontend/Rewrite/FrontendActions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "clang/Rewrite/Frontend/FixItRewriter.h"

#include "clang/Rewrite/Frontend/Rewriters.h"

#include "clang/Serialization/ASTReader.h"

#include "clang/Serialization/Module.h"

#include "clang/Serialization/ModuleFile.h"

#include "clang/Serialization/ModuleManager.h"

#include "llvm/ADT/DenseSet.h"

#include "llvm/Support/CrashRecoveryContext.h"