Fix a typo preventing gcc compilation

Increment version string to 0.3.0-rc3
Add version string to IfcObj output
This commit is contained in:
Thomas Krijnen
2012-03-19 10:12:56 +00:00
parent c31bc16dba
commit 4760ad1910
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -59,7 +59,7 @@ int main ( int argc, char** argv ) {
return 1; return 1;
} }
fObj << "# File generated by IfcOpenShell" << std::endl; fObj << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << std::endl;
fObj << "mtllib " << fnMtl << std::endl; fObj << "mtllib " << fnMtl << std::endl;
std::set<std::string> materials; std::set<std::string> materials;
@@ -107,7 +107,7 @@ int main ( int argc, char** argv ) {
std::cout << "\rDone creating geometry " << std::endl; std::cout << "\rDone creating geometry " << std::endl;
// Writes the material settings, defined in Materials.h // Writes the material settings, defined in Materials.h
fMtl << "# File generated by IfcOpenShell" << std::endl; fMtl << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << std::endl;
for( std::set<std::string>::iterator it = materials.begin(); it != materials.end(); ++ it ) { for( std::set<std::string>::iterator it = materials.begin(); it != materials.end(); ++ it ) {
fMtl << GetMaterial(*it); fMtl << GetMaterial(*it);
} }
+2 -2
View File
@@ -27,7 +27,7 @@
#ifndef IFCPARSE_H #ifndef IFCPARSE_H
#define IFCPARSE_H #define IFCPARSE_H
#define IFCOPENSHELL_VERSION "0.3.0-rc2" #define IFCOPENSHELL_VERSION "0.3.0-rc3"
#include <string> #include <string>
#include <sstream> #include <sstream>
@@ -260,7 +260,7 @@ public:
/// Returns the entity with the specified id /// Returns the entity with the specified id
static IfcEntity EntityById(int id); static IfcEntity EntityById(int id);
/// Returns the entity with the specified GlobalId /// Returns the entity with the specified GlobalId
static Ifc2x3::IfcRoot::ptr Ifc::EntityByGuid(const std::string& guid); static Ifc2x3::IfcRoot::ptr EntityByGuid(const std::string& guid);
static bool Init(const std::string& fn); static bool Init(const std::string& fn);
static bool Init(std::istream& fn, int len); static bool Init(std::istream& fn, int len);
static bool Init(void* data, int len); static bool Init(void* data, int len);