Resolve merge conflict

This commit is contained in:
Thomas Krijnen
2024-04-18 10:14:42 +02:00
parent 7aa7f26708
commit 4e4b8e0de1
+1 -8
View File
@@ -137,6 +137,7 @@ class IFC_PARSE_API IfcWriteArgument : public Argument {
// Overload to detect null values // Overload to detect null values
void set(const aggregate_of_aggregate_of_instance::ptr& value); void set(const aggregate_of_aggregate_of_instance::ptr& value);
// Overload to detect null values // Overload to detect null values
void set(IfcUtil::IfcBaseInterface*const & v); void set(IfcUtil::IfcBaseInterface*const & v);
@@ -148,14 +149,6 @@ class IFC_PARSE_API IfcWriteArgument : public Argument {
operator int() const; operator int() const;
operator bool() const; operator bool() const;
operator boost::logic::tribool() const; operator boost::logic::tribool() const;
// Overload to detect null values
void set(IfcUtil::IfcBaseInterface* const& value);
operator int() const;
operator bool() const;
operator boost::logic::tribool() const;
operator double() const; operator double() const;
operator std::string() const; operator std::string() const;
operator boost::dynamic_bitset<>() const; operator boost::dynamic_bitset<>() const;