From f80e8b39a18f1fc24b46a7693fc73c2f0553a228 Mon Sep 17 00:00:00 2001 From: Alexandre Avenel Date: Fri, 24 Nov 2017 22:08:50 +0100 Subject: [PATCH] Fix warning C4138: '*/' found outside of comment on MSVC14 --- code/D3MFImporter.cpp | 2 +- code/FIReader.cpp | 4 ++-- code/MMDImporter.cpp | 2 +- code/MMDPmxParser.cpp | 2 +- code/OpenGEXExporter.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index 6d61a0669..e52c72346 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -344,7 +344,7 @@ bool D3MFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool return false; } -void D3MFImporter::SetupProperties(const Importer */*pImp*/) +void D3MFImporter::SetupProperties(const Importer * /*pImp*/) { } diff --git a/code/FIReader.cpp b/code/FIReader.cpp index 53cff257a..a0b9b39e1 100755 --- a/code/FIReader.cpp +++ b/code/FIReader.cpp @@ -1790,9 +1790,9 @@ public: return nullptr; } - virtual void registerDecoder(const std::string &/*algorithmUri*/, std::unique_ptr /*decoder*/) /*override*/ {} + virtual void registerDecoder(const std::string & /*algorithmUri*/, std::unique_ptr /*decoder*/) /*override*/ {} - virtual void registerVocabulary(const std::string &/*vocabularyUri*/, const FIVocabulary */*vocabulary*/) /*override*/ {} + virtual void registerVocabulary(const std::string & /*vocabularyUri*/, const FIVocabulary * /*vocabulary*/) /*override*/ {} private: diff --git a/code/MMDImporter.cpp b/code/MMDImporter.cpp index cf7c87c8a..01f009519 100644 --- a/code/MMDImporter.cpp +++ b/code/MMDImporter.cpp @@ -107,7 +107,7 @@ const aiImporterDesc *MMDImporter::GetInfo() const { return &desc; } // ------------------------------------------------------------------------------------------------ // MMD import implementation void MMDImporter::InternReadFile(const std::string &file, aiScene *pScene, - IOSystem */*pIOHandler*/) { + IOSystem * /*pIOHandler*/) { // Read file by istream std::filebuf fb; if (!fb.open(file, std::ios::in | std::ios::binary)) { diff --git a/code/MMDPmxParser.cpp b/code/MMDPmxParser.cpp index 5be370f26..970cbc31e 100644 --- a/code/MMDPmxParser.cpp +++ b/code/MMDPmxParser.cpp @@ -471,7 +471,7 @@ namespace pmx stream->read((char*) &this->is_near, sizeof(uint8_t)); } - void PmxSoftBody::Read(std::istream */*stream*/, PmxSetting */*setting*/) + void PmxSoftBody::Read(std::istream * /*stream*/, PmxSetting * /*setting*/) { // 未実装 std::cerr << "Not Implemented Exception" << std::endl; diff --git a/code/OpenGEXExporter.cpp b/code/OpenGEXExporter.cpp index b3597656b..0f2b1c35b 100644 --- a/code/OpenGEXExporter.cpp +++ b/code/OpenGEXExporter.cpp @@ -51,7 +51,7 @@ OpenGEXExporter::OpenGEXExporter() { OpenGEXExporter::~OpenGEXExporter() { } -bool OpenGEXExporter::exportScene( const char */*filename*/, const aiScene* /*pScene*/ ) { +bool OpenGEXExporter::exportScene( const char * /*filename*/, const aiScene* /*pScene*/ ) { return true; }