From 11d0c6ef5690c40e9481cc38e4567253b689b18c Mon Sep 17 00:00:00 2001 From: Victor Haefner Date: Fri, 8 Jun 2018 15:25:33 +0300 Subject: [PATCH] compiles under ubuntu 18.04 --- cmake/CMakeLists.txt | 3 ++- src/ifcparse/IfcCharacterDecoder.cpp | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b157cd56eb..ad286ec85e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -549,8 +549,9 @@ if(NOT MSVC) message(FATAL_ERROR "OCCT7 requires a compiler with C++11 support") endif() else() - add_definitions(-std=c++03) + add_definitions(-std=c++0x) endif() + endif() set(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom) diff --git a/src/ifcparse/IfcCharacterDecoder.cpp b/src/ifcparse/IfcCharacterDecoder.cpp index cbf8e2f6f8..41638366a8 100644 --- a/src/ifcparse/IfcCharacterDecoder.cpp +++ b/src/ifcparse/IfcCharacterDecoder.cpp @@ -70,6 +70,10 @@ using namespace IfcParse; using namespace IfcWrite; +#ifdef HAVE_ICU +#include +#endif + void IfcCharacterDecoder::addChar(std::stringstream& s,const UChar32& ch) { #ifdef HAVE_ICU if ( destination ) { @@ -386,4 +390,4 @@ IfcCharacterEncoder::operator std::string() { #ifdef HAVE_ICU UErrorCode IfcCharacterEncoder::status = U_ZERO_ERROR; UConverter* IfcCharacterEncoder::converter = 0; -#endif \ No newline at end of file +#endif