Misc

Author: asfernandes

src/fb-cpp/Attachment.cpp

@@ -37,7 +37,7 @@ Attachment::Attachment(Client& client, const std::string& uri, const AttachmentO
 
 	StatusWrapper statusWrapper{client};
 
-	auto dpbBuilder = fbUnique(master->getUtilInterface()->getXpbBuilder(&statusWrapper, fb::IXpbBuilder::DPB,
+	auto dpbBuilder = fbUnique(client.getUtil()->getXpbBuilder(&statusWrapper, fb::IXpbBuilder::DPB,
 		reinterpret_cast<const std::uint8_t*>(options.getDpb().data()),
 		static_cast<unsigned>(options.getDpb().size())));
 

src/fb-cpp/Row.h

@@ -73,9 +73,9 @@ namespace fbcpp
 		/// @param message Span over the raw row data.
 		///
 		Row(Client& client, const std::vector<Descriptor>& descriptors, std::span<const std::byte> message)
-			: message{message},
+			: client{&client},
 			  descriptors{&descriptors},
-			  client{&client},
+			  message{message},
 			  statusWrapper{client},
 			  numericConverter{client},
 			  calendarConverter{client}
@@ -1017,9 +1017,9 @@ namespace fbcpp
 		}
 
 	private:
+		Client* client;
+		const std::vector<Descriptor>* descriptors;
 		std::span<const std::byte> message;
-		const std::vector<Descriptor>* descriptors = nullptr;
-		Client* client = nullptr;
 		impl::StatusWrapper statusWrapper;
 		impl::NumericConverter numericConverter;
 		impl::CalendarConverter calendarConverter;

src/fb-cpp/RowSet.h

@@ -152,7 +152,7 @@ namespace fbcpp
 		}
 
 	private:
-		Client* client = nullptr;
+		Client* client;
 		unsigned count = 0;
 		unsigned messageLength = 0;
 		std::vector<std::byte> buffer;