Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vs2013 warnings in unittests

Browse Source
This commit is contained in:
kimkulling
2020-03-20 10:04:44 +01:00
parent ac3f08a4d8
commit dd58568d60
2 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/utHMPImportExport.cpp
View File

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -40,11 +38,11 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------
*/
#include "UnitTestPCH.h"
#include "AbstractImportExportBase.h"
#include "UnitTestPCH.h"
#include <assimp/Importer.hpp>
#include <assimp/postprocess.h>
#include <assimp/Importer.hpp>
using namespace Assimp;
@@ -52,13 +50,11 @@ class utHMPImportExport : public AbstractImportExportBase {
public:
virtual bool importerTest() {
Assimp::Importer importer;
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/HMP/terrain.hmp", aiProcess_ValidateDataStructure );
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/HMP/terrain.hmp", aiProcess_ValidateDataStructure);
return nullptr != scene;
return true;
}
};
TEST_F( utHMPImportExport, importHMPFromFileTest ) {
EXPECT_TRUE( importerTest() );
TEST_F(utHMPImportExport, importHMPFromFileTest) {
EXPECT_TRUE(importerTest());
}