Fix compilation errors of IfcCharacterEncoder in case ICU is not available

aothms · aothms · commit 0814c16f0635 · 2012-09-16T12:45:44.000Z
diff --git a/src/ifcparse/IfcCharacterDecoder.cpp b/src/ifcparse/IfcCharacterDecoder.cpp
@@ -300,13 +300,17 @@ char IfcCharacterDecoder::substitution_character = '_';
 
 
 IfcCharacterEncoder::IfcCharacterEncoder(const std::string& input) {
+#ifdef HAVE_ICU
 	if ( !converter) converter = ucnv_open("utf-8", &status);
+#endif
 	str = input;
 }
 
 IfcCharacterEncoder::~IfcCharacterEncoder() {
+#ifdef HAVE_ICU
 	if ( !converter) ucnv_close(converter);
 	converter = 0;
+#endif
 }
 
 IfcCharacterEncoder::operator std::string() {
diff --git a/src/ifcparse/IfcCharacterDecoder.h b/src/ifcparse/IfcCharacterDecoder.h
@@ -77,10 +77,10 @@ namespace IfcWrite {
 
 	class IfcCharacterEncoder {
 	private:
+		std::string str;
 #ifdef HAVE_ICU
 		static UErrorCode status;
 		static UConverter* converter;
-		std::string str;
 #endif
 	public:
 		IfcCharacterEncoder(const std::string& input);

Original file line number	Diff line number	Diff line change
`@@ -300,13 +300,17 @@ char IfcCharacterDecoder::substitution_character = '_';`
`300`	`300`
`301`	`301`
`302`	`302`	`IfcCharacterEncoder::IfcCharacterEncoder(const std::string& input) {`
	`303`	`+#ifdef HAVE_ICU`
`303`	`304`	`if ( !converter) converter = ucnv_open("utf-8", &status);`
	`305`	`+#endif`
`304`	`306`	`str = input;`
`305`	`307`	`}`
`306`	`308`
`307`	`309`	`IfcCharacterEncoder::~IfcCharacterEncoder() {`
	`310`	`+#ifdef HAVE_ICU`
`308`	`311`	`if ( !converter) ucnv_close(converter);`
`309`	`312`	`converter = 0;`
	`313`	`+#endif`
`310`	`314`	`}`
`311`	`315`
`312`	`316`	`IfcCharacterEncoder::operator std::string() {`