Resolve merge conflict

aothms · aothms · commit 4e4b8e0de1ad · 2024-04-18T10:14:42.000+02:00
diff --git a/src/ifcparse/IfcWrite.h b/src/ifcparse/IfcWrite.h
@@ -137,25 +137,18 @@ class IFC_PARSE_API IfcWriteArgument : public Argument {
 
     // Overload to detect null values
     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
-    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 bool() const;
     operator boost::logic::tribool() const;
-
     operator double() const;
     operator std::string() const;
     operator boost::dynamic_bitset<>() const;
