Skip to content

Commit 3f8ee44

Browse files
svenvhjsji
authored andcommitted
Drop 'using namespace std' everywhere (#2755)
Most uses of std functionality already have explicit `std::` qualifications, so qualify the remaining unqualified uses and drop the `using namespace` directives. Original commit: KhronosGroup/SPIRV-LLVM-Translator@29b02642964a240
1 parent e75b386 commit 3f8ee44

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494

9595
#define DEBUG_TYPE "spirv"
9696

97-
using namespace std;
9897
using namespace llvm;
9998
using namespace SPIRV;
10099
using namespace OCLUtil;
@@ -1258,8 +1257,8 @@ Value *SPIRVToLLVM::oclTransConstantSampler(SPIRV::SPIRVConstantSampler *BCS,
12581257
Value *SPIRVToLLVM::oclTransConstantPipeStorage(
12591258
SPIRV::SPIRVConstantPipeStorage *BCPS) {
12601259

1261-
string CPSName = string(kSPIRVTypeName::PrefixAndDelim) +
1262-
kSPIRVTypeName::ConstantPipeStorage;
1260+
std::string CPSName = std::string(kSPIRVTypeName::PrefixAndDelim) +
1261+
kSPIRVTypeName::ConstantPipeStorage;
12631262

12641263
auto *Int32Ty = IntegerType::getInt32Ty(*Context);
12651264
auto *CPSTy = StructType::getTypeByName(*Context, CPSName);
@@ -3439,7 +3438,7 @@ SPIRVToLLVM::SPIRVToLLVM(Module *LLVMModule, SPIRVModule *TheSPIRVModule)
34393438
}
34403439

34413440
std::string getSPIRVFuncSuffix(SPIRVInstruction *BI) {
3442-
string Suffix = "";
3441+
std::string Suffix = "";
34433442
if (BI->getOpCode() == OpCreatePipeFromPipeStorage) {
34443443
auto *CPFPS = static_cast<SPIRVCreatePipeFromPipeStorage *>(BI);
34453444
assert(CPFPS->getType()->isTypePipe() &&
@@ -3495,7 +3494,7 @@ std::string getSPIRVFuncSuffix(SPIRVInstruction *BI) {
34953494
int Dim = EleTy->isTypeArray() ? EleTy->getArrayLength() : 1;
34963495
assert((EleTy->isTypeInt() && Dim == 1) ||
34973496
(EleTy->isTypeArray() && Dim >= 2 && Dim <= 3));
3498-
ostringstream OS;
3497+
std::ostringstream OS;
34993498
OS << Dim;
35003499
Suffix += OS.str() + "D";
35013500
}

llvm-spirv/lib/SPIRV/SPIRVToLLVMDbgTran.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#include "llvm/IR/IntrinsicInst.h"
5252
#include "llvm/IR/Module.h"
5353

54-
using namespace std;
5554
using namespace SPIRVDebug::Operand;
5655

5756
namespace SPIRV {
@@ -1806,7 +1805,7 @@ DIBuilder &SPIRVToLLVMDbgTran::getDIBuilder(const SPIRVExtInst *DebugInst) {
18061805
return *BuilderMap[DebugInst->getId()];
18071806
}
18081807

1809-
SPIRVToLLVMDbgTran::SplitFileName::SplitFileName(const string &FileName) {
1808+
SPIRVToLLVMDbgTran::SplitFileName::SplitFileName(const std::string &FileName) {
18101809
auto Loc = FileName.find_last_of("/\\");
18111810
if (Loc != std::string::npos) {
18121811
BaseName = FileName.substr(Loc + 1);
@@ -1835,7 +1834,7 @@ SPIRVToLLVMDbgTran::ParseChecksum(StringRef Text) {
18351834
auto KindPos = Text.find(SPIRVDebug::ChecksumKindPrefx);
18361835
if (KindPos != StringRef::npos) {
18371836
auto ColonPos = Text.find(":", KindPos);
1838-
KindPos += string("//__").size();
1837+
KindPos += std::string("//__").size();
18391838
auto KindStr = Text.substr(KindPos, ColonPos - KindPos);
18401839
auto Checksum = Text.substr(ColonPos).ltrim(':');
18411840
if (auto Kind = DIFile::getChecksumKind(KindStr)) {

0 commit comments

Comments
 (0)