msvc warnings/errors
This commit is contained in:
parent
4d32009592
commit
7316fe5070
5 changed files with 9 additions and 8 deletions
|
|
@ -62,10 +62,11 @@
|
|||
|
||||
#include "judy.h"
|
||||
|
||||
#if defined(STANDALONE) || defined(ASKITIS)
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#if defined(STANDALONE) || defined(ASKITIS)
|
||||
|
||||
extern unsigned int MaxMem;
|
||||
|
||||
// void judy_abort (char *msg) __attribute__ ((noreturn)); // Tell static analyser that this function will not return
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#ifdef __cplusplus
|
||||
#include <iostream>
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
|
||||
#include "sc_memmgr.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
#include "lazyTypes.h"
|
||||
#include "lazyInstMgr.h"
|
||||
#include "ExpDict.h"
|
||||
#include "sdaiApplication_instance.h"
|
||||
#include "SubSuperIterators.h"
|
||||
#include <STEPattribute.h>
|
||||
#include <STEPaggregate.h>
|
||||
|
|
@ -19,7 +18,7 @@
|
|||
#define strcasecmp _strcmpi
|
||||
#endif // _WIN32
|
||||
|
||||
|
||||
class SDAI_Application_instance;
|
||||
/*
|
||||
* given inverted attr ia:
|
||||
* attr method value
|
||||
|
|
@ -132,7 +131,7 @@ class SC_LAZYFILE_EXPORT lazyRefs {
|
|||
bool found = false;
|
||||
if( sa.getADesc()->IsAggrType() ) {
|
||||
//aggregate - search for current inst id
|
||||
EntityAggregate * aggr = dynamic_cast< EntityAggregate * >( sa.Aggregate());
|
||||
EntityAggregate * aggr = dynamic_cast< EntityAggregate * >( sa.Aggregate() );
|
||||
assert( aggr );
|
||||
EntityNode * en = ( EntityNode * ) aggr->GetHead();
|
||||
while( en ) {
|
||||
|
|
@ -180,7 +179,7 @@ class SC_LAZYFILE_EXPORT lazyRefs {
|
|||
}
|
||||
std::cerr << "Error! inverse attr " << ia->Name() << " (" << ia << ") not found in iAMap for entity " << inst->getEDesc()->Name() << std::endl;
|
||||
abort();
|
||||
iAstruct nil;
|
||||
iAstruct nil = {nullptr};
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -946,7 +946,7 @@ const SDAI_Application_instance::iAMap_t::value_type SDAI_Application_instance::
|
|||
}
|
||||
iAstruct z;
|
||||
memset( &z, 0, sizeof z );
|
||||
iAMap_t::value_type nil( nullptr, z );
|
||||
iAMap_t::value_type nil( (Inverse_attribute *) nullptr, z );
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef STEPENTITY_H
|
||||
#define STEPENTITY_H 1
|
||||
#define STEPENTITY_H
|
||||
|
||||
/*
|
||||
* NIST STEP Core Class Library
|
||||
|
|
@ -197,4 +197,4 @@ class SC_CORE_EXPORT SDAI_Application_instance : public SDAI_DAObject_SDAI {
|
|||
typedef SDAI_Application_instance * SDAI_Application_instance_ptr;
|
||||
typedef SDAI_Application_instance_ptr SDAI_Application_instance_var;
|
||||
|
||||
#endif
|
||||
#endif //STEPENTITY_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue