Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-28 19:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source 
# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
This commit is contained in:
Thomas Krijnen
2019-05-28 12:50:38 +02:00
parent 8b382df7cc b27482db46
commit 98bf6c2d95
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcconvert/IfcConvert.cpp
+2 -2
View File
@@ -75,7 +75,7 @@ static std::ostream& cout_ = std::cout;
static std::ostream& cerr_ = std::cerr; static std::ostream& cerr_ = std::cerr;
#endif #endif
const std::string DEFAULT_EXTENSION = "obj"; const std::string DEFAULT_EXTENSION = ".obj";
const std::string TEMP_FILE_EXTENSION = ".tmp"; const std::string TEMP_FILE_EXTENSION = ".tmp";
namespace po = boost::program_options; namespace po = boost::program_options;
@@ -103,7 +103,7 @@ void print_usage(bool suggest_help = true)
<< " .svg SVG Scalable Vector Graphics (2D floor plan)\n" << " .svg SVG Scalable Vector Graphics (2D floor plan)\n"
<< " .ifc IFC-SPF Industry Foundation Classes\n" << " .ifc IFC-SPF Industry Foundation Classes\n"
<< "\n" << "\n"
<< "If no output filename given, <input>." << IfcUtil::path::from_utf8(DEFAULT_EXTENSION) << " will be used as the output file.\n"; << "If no output filename given, <input>" << IfcUtil::path::from_utf8(DEFAULT_EXTENSION) << " will be used as the output file.\n";
if (suggest_help) { if (suggest_help) {
cout_ << "\nRun 'IfcConvert --help' for more information."; cout_ << "\nRun 'IfcConvert --help' for more information.";
} }