diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp index a5a3359ca..6a6dc67b6 100644 --- a/code/ColladaExporter.cpp +++ b/code/ColladaExporter.cpp @@ -530,7 +530,7 @@ void ColladaExporter::ReadMaterialSurface( Surface& poSurface, const aiMaterial* // Reimplementation of isalnum(,C locale), because AppVeyor does not see standard version. static bool isalnum_C(char c) { - return strchr("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",c); + return ( nullptr != strchr("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",c) ); } // ------------------------------------------------------------------------------------------------ diff --git a/code/StringUtils.h b/code/StringUtils.h index 7aa32fea2..99352ebfb 100644 --- a/code/StringUtils.h +++ b/code/StringUtils.h @@ -83,6 +83,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif template +inline std::string to_string( T value ) { std::ostringstream os; os << value; diff --git a/test/unit/utIssues.cpp b/test/unit/utIssues.cpp index 7346009ba..3f259eab4 100644 --- a/test/unit/utIssues.cpp +++ b/test/unit/utIssues.cpp @@ -90,9 +90,9 @@ TEST_F( utIssues, OpacityBugWhenExporting_727 ) { Assimp::Importer importer; Assimp::Exporter exporter; for ( std::size_t i( 0 ); i < exporter.GetExportFormatCount(); ++i ) { - /*const aiExportFormatDesc *desc( exporter.GetExportFormatDescription( i ) ); - std::cout << "[" << desc->id << "] "; - std::string path( "scene." ); + std::string path; + const aiExportFormatDesc *desc( exporter.GetExportFormatDescription( i ) ); + EXPECT_NE( desc, nullptr ); path.append( desc->fileExtension ); ASSERT_EQ( AI_SUCCESS, exporter.Export( scene, desc->id, path ) ); @@ -102,7 +102,7 @@ TEST_F( utIssues, OpacityBugWhenExporting_727 ) { if ( newScene->mNumMaterials > 0 ) { //ASSERT_EQ( AI_SUCCESS, newScene->mMaterials[ 0 ]->Get( AI_MATKEY_OPACITY, newOpacity ) ); //EXPECT_EQ( opacity, newOpacity ); - }*/ + } } }