lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 14:56:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

tune classes to remove need for clang_compiler macro

Browse Source
This commit is contained in:
Steve Baer
2021-12-27 20:30:01 -08:00
parent a098ce3208
commit 9fe66208e0
3 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opennurbs_extensions.h
View File

@@ -2065,18 +2065,18 @@ public:
std::shared_ptr<ONX_Model> ReadWriteReadModel() const;
private:
ONX_ModelTest::Type m_test_type = ONX_ModelTest::Type::Unset;
private:
ONX_ModelTest::Type m_test_type = ONX_ModelTest::Type::Unset;
ON_wString m_source_3dm_file_path;
ON_wString m_source_3dm_file_path;
// if set, used when printing the name of m_source_3dm_file_path in the text
// log so results from different computers can be compared.
ON_wString m_text_log_3dm_file_path;
// if set, used when printing the name of m_source_3dm_file_path in the text
// log so results from different computers can be compared.
ON_wString m_text_log_3dm_file_path;
unsigned int m_model_3dm_file_version[3];
unsigned int m_model_3dm_file_version[3] = {0};
unsigned int m_current_test_index = 0;
unsigned int m_current_test_index = 0;
ONX_ModelTest::Result m_test_result = ONX_ModelTest::Result::Unset;
ONX_ModelTest::Result m_test_results[7] = {};

2
opennurbs_string_value.h
View File

@@ -432,7 +432,7 @@ public:
private:
// parsing context
unsigned int m_context_locale_id = 0;
ON::LengthUnitSystem m_context_length_unit_system;
ON::LengthUnitSystem m_context_length_unit_system = ON::LengthUnitSystem::None;
ON_AngleValue::StringFormat m_string_format = ON_AngleValue::StringFormat::ExactDecimal;
ON::AngleUnitSystem m_angle_unit_system = ON::AngleUnitSystem::Unset;

29
opennurbs_system_compiler.h
View File

@@ -235,8 +235,6 @@
//
/////////////////////////////////////////////////////////////////////////////////////
#define ON_CLANG_CONSTRUCTOR_BUG
#endif
#endif
@@ -275,33 +273,6 @@
#define ON_PRAGMA_WARNING_POP clang diagnostic pop // Apple CLang warning state pop
#define ON_PRAGMA_WARNING_DISABLE_CLANG(ON_PRAGMA_WARNING_DISABLE_param) clang diagnostic ignored ON_PRAGMA_WARNING_DISABLE_param // Apple CLang warning disable
// clang has a bug that is fails to correctly construct statc const objects
// in the following case
//
// // header file
// class Blah
// {
// public:
// Blah() = default;
// ~Blah() = default;
// Blah(const Blah&) = default;
// Blah& operator=(const Blah&) = default;
//
// static const Blah Zero;
//
// int m_i = 0;
// };
//
// ...
//
// // cpp file
// const Blah Blah::Zero; // correct C++ 11, Apple's clang fails as of February, 2015
// const Blah Blah::Zero( Blah() ); // clang fails to use copy constructor
// const Blah Blah::Zero = Blah(); // clang can handle this
//
// When this bug is fixed, delete this define and the places
// in the code that use it.
#define ON_CLANG_CONSTRUCTOR_BUG
#if defined(__has_feature) && __has_feature(cxx_noexcept)
#undef ON_NOEXCEPT