Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-07 12:56:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '58ce86d538971fc1815d56368d7077aa85e0592c' into v0.6.0

Browse Source
This commit is contained in:
Thomas Krijnen
2018-09-08 13:07:09 +02:00
parent 472c3478e0 58ce86d538
commit 3a4fa2e6dd
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+3 -1
View File
@@ -17,7 +17,9 @@
# # # #
################################################################################ ################################################################################
cmake_minimum_required (VERSION 2.8.5) cmake_minimum_required(VERSION 3.1.3)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
project (IfcOpenShell) project (IfcOpenShell)
src/ifcparse/IfcCharacterDecoder.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ void IfcCharacterDecoder::addChar(std::stringstream& s,const UChar32& ch) {
maximum length in bytes is 4. We add 1 for the NUL character. In other encodings maximum length in bytes is 4. We add 1 for the NUL character. In other encodings
the length could be higher, but we have not taken that into account. */ the length could be higher, but we have not taken that into account. */
char extraction_buffer[5] = {}; char extraction_buffer[5] = {};
UnicodeString(ch).extract(extraction_buffer,5,destination,status); icu::UnicodeString(ch).extract(extraction_buffer,5,destination,status);
extraction_buffer[4] = '\0'; extraction_buffer[4] = '\0';
s << extraction_buffer; s << extraction_buffer;
} else { } else {
src/ifcparse/IfcCharacterDecoder.h
+1
View File
@@ -32,6 +32,7 @@
#ifdef HAVE_ICU #ifdef HAVE_ICU
#include "unicode/ucnv.h" #include "unicode/ucnv.h"
#include "unicode/unistr.h"
#else #else
typedef unsigned int UChar32; typedef unsigned int UChar32;
#endif #endif