mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-16 13:46:54 +00:00
Resolve merge conflict
This commit is contained in:
+6
-13
@@ -137,25 +137,18 @@ 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
|
|
||||||
void set(IfcUtil::IfcBaseInterface*const & v);
|
|
||||||
|
|
||||||
// Overloads to raise exceptions on non-finite values
|
|
||||||
void set(const double& v);
|
|
||||||
void set(const std::vector<double>& v);
|
|
||||||
void set(const std::vector< std::vector<double> >& v);
|
|
||||||
|
|
||||||
operator int() const;
|
|
||||||
operator bool() const;
|
|
||||||
operator boost::logic::tribool() const;
|
|
||||||
|
|
||||||
// Overload to detect null values
|
// Overload to detect null values
|
||||||
void set(IfcUtil::IfcBaseInterface* const& value);
|
void set(IfcUtil::IfcBaseInterface*const & v);
|
||||||
|
|
||||||
|
// Overloads to raise exceptions on non-finite values
|
||||||
|
void set(const double& v);
|
||||||
|
void set(const std::vector<double>& v);
|
||||||
|
void set(const std::vector< std::vector<double> >& v);
|
||||||
|
|
||||||
operator int() const;
|
operator int() const;
|
||||||
operator bool() const;
|
operator bool() const;
|
||||||
operator boost::logic::tribool() 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;
|
||||||
|
|||||||
Reference in New Issue
Block a user