Update win build script and cmake for HDF5 library

This commit is contained in:
Thomas Krijnen
2017-08-18 15:29:05 +02:00
parent 2a0471ec27
commit 4163f817a6
7 changed files with 68 additions and 13 deletions
+3 -5
View File
@@ -1,11 +1,9 @@
#include "../ifcparse/IfcHdf5File.h"
#include <limits>
#include <H5pubconf.h>
#include <boost/lexical_cast.hpp>
#include "IfcHdf5File.h"
#include "H5pubconf.h"
#ifndef H5_HAVE_FILTER_DEFLATE
#pragma message("warning: HDF5 compression support is recommended")
#endif
+1 -1
View File
@@ -22,7 +22,7 @@
#define SORT_ON_NAME
#include "H5Cpp.h"
#include <H5Cpp.h>
#include "../ifcparse/Hdf5Settings.h"
#include "../ifcparse/IfcUtil.h"
+2 -2
View File
@@ -54,8 +54,8 @@ namespace IfcParse {
virtual const simple_type* as_simple_type() const { return static_cast<simple_type*>(0); }
virtual const aggregation_type* as_aggregation_type() const { return static_cast<aggregation_type*>(0); }
virtual bool is(const std::string& name) const { return false; }
virtual bool is(IfcSchema::Type::Enum name) const { return false; }
virtual bool is(const std::string& /*name*/) const { return false; }
virtual bool is(IfcSchema::Type::Enum /*name*/) const { return false; }
};
class named_type : public parameter_type {
+1 -1
View File
@@ -257,7 +257,7 @@ public:
const std::vector<IfcUtil::IfcBaseClass*>& from = *outer;
typename std::vector<U*> to;
for (inner_it inner = from.begin(); inner != from.end(); ++ inner) {
if (all || (*inner)->is(U::Class())) to.push_back((U*)*inner);
if (all || (*inner)->declaration().is(U::Class())) to.push_back((U*)*inner);
}
r->push(to);
}