zerodefect PR #38: move semantics for AJAAncillaryList:

• added “BFT_AncListMoveSemantics” test case to ut_ajaanc, plus minor edits

Author: mrbillaja

ajaanc/includes/ancillarylist.h

@@ -176,9 +176,6 @@ class AJAExport AJAAncillaryList
 	///@{
 											AJAAncillaryList ();			///< @brief	Instantiate and initialize with a default set of values.
 	inline									AJAAncillaryList (const AJAAncillaryList & inRHS)	{*this = inRHS;}	///< @brief	My copy constructor.
-#if defined(AJA_USE_CPLUSPLUS11)
-											AJAAncillaryList (AJAAncillaryList && inRHS);	///< @brief Move-construct constructor.
-#endif
 	virtual									~AJAAncillaryList ();			///< @brief	My destructor.
 
 	/**
@@ -187,16 +184,24 @@ class AJAExport AJAAncillaryList
 		@return		A non-const reference to myself.
 	**/
 	virtual AJAAncillaryList &				operator = (const AJAAncillaryList & inRHS);
-	///@}
 
 #if defined(AJA_USE_CPLUSPLUS11)
 	/**
-		@brief		Move-assignment operator -- moves contents from the right-hand-side to my contents, replacing my contents, and resets the right-hand-side.
-		@param[in]	inRHS	The list of packets to be move into me.
-		@return		An r-value reference to myself.
+		@brief		Move-assignment constructor -- moves contents from the right-hand-side to my contents,
+					replacing my contents, and resets the right-hand-side.
+		@param[in]	inRHS	The list of packets to move into me.
+		@return		A non-const reference to myself.
 	**/
-	virtual AJAAncillaryList &				operator = (AJAAncillaryList && inRHS);	///< @brief Move-construct constructor.
-#endif
+											AJAAncillaryList (AJAAncillaryList && inRHS) noexcept;	//	(New in SDK 17.5)
+	/**
+		@brief		Move-assignment operator -- moves contents from the right-hand-side to my contents,
+					replacing my contents, and resets the right-hand-side.
+		@param[in]	inRHS	The list of packets to move into me.
+		@return		A non-const reference to myself.
+	**/
+	virtual AJAAncillaryList &				operator = (AJAAncillaryList && inRHS);	//	(New in SDK 17.5)
+#endif	//	AJA_USE_CPLUSPLUS11
+	///@}
 
 
 	/**

ajaanc/src/ancillarylist.cpp

@@ -167,19 +167,19 @@ AJAAncillaryList::AJAAncillaryList ()
 }
 
 #if defined(AJA_USE_CPLUSPLUS11)
-AJAAncillaryList::AJAAncillaryList(AJAAncillaryList && inRHS)
-	:	m_ancList(std::move(inRHS.m_ancList)),
-		m_rcvMultiRTP(inRHS.m_rcvMultiRTP),		//	By default, handle receiving multiple RTP packets
-		m_xmitMultiRTP(inRHS.m_xmitMultiRTP),	//	By default, transmit single RTP packet
-		m_ignoreCS(inRHS.m_ignoreCS)
+AJAAncillaryList::AJAAncillaryList (AJAAncillaryList && inRHS) noexcept
+	:	m_ancList		(std::move(inRHS.m_ancList)),
+		m_rcvMultiRTP	(inRHS.m_rcvMultiRTP),		//	By default, handle receiving multiple RTP packets
+		m_xmitMultiRTP	(inRHS.m_xmitMultiRTP),	//	By default, transmit single RTP packet
+		m_ignoreCS		(inRHS.m_ignoreCS)
 {
-	// Reset RHS.
+	//	Reset RHS...
 	inRHS.m_rcvMultiRTP = true;
 	inRHS.m_xmitMultiRTP = false;
 	inRHS.m_ignoreCS = false;
-	// inRHS.m_ancList - already moved/reset.
+	//	inRHS.m_ancList - already moved/reset
 }
-#endif
+#endif	//	defined(AJA_USE_CPLUSPLUS11)
 
 
 AJAAncillaryList::~AJAAncillaryList ()
@@ -222,7 +222,7 @@ AJAAncillaryList & AJAAncillaryList::operator = (AJAAncillaryList && inRHS)
 	}
 	return *this;
 }
-#endif
+#endif	//	defined(AJA_USE_CPLUSPLUS11)
 
 AJAAncillaryData * AJAAncillaryList::GetAncillaryDataAtIndex (const uint32_t inIndex) const
 {

ajaanc/test/main.cpp

@@ -3452,6 +3452,36 @@ cout << "AnalogTest -- " << pkts << endl;
 #endif	//	DISABLED FOR NOW
 
 
+#if defined(AJA_USE_CPLUSPLUS11)
+		TEST_CASE("BFT_AncListMoveSemantics")
+		{
+			const string myPacketData ("This is a test packet to be used with the new move semantics added to AJAAncillaryList");
+			AJAAncillaryData pkt;
+			pkt.SetDID(0xAA);  pkt.SetSID(0xBB);
+			pkt.SetPayloadData(reinterpret_cast<const uint8_t*>(myPacketData.c_str()), myPacketData.length());
+			AJAAncillaryList pktsC;
+
+			//	Create "A" list of 1024 packets...
+			AJAAncillaryList pktsA;
+			while (pktsA.CountAncillaryData() < 1024)
+				pktsA.AddAncillaryData(pkt);
+			CHECK_EQ(pktsA.CountAncillaryData(), 1024);
+			CHECK_EQ(pktsC.CountAncillaryData(), 0);
+
+			//	Move A's packets into new "B" list...
+			AJAAncillaryList pktsB(std::move(pktsA));
+			CHECK_EQ(pktsC.CountAncillaryData(), 0);
+			CHECK_EQ(pktsA.CountAncillaryData(), 0);
+			CHECK_EQ(pktsB.CountAncillaryData(), 1024);
+
+			//	Move B's packets into "C"...
+			pktsC = std::move(pktsB);
+			CHECK_EQ(pktsB.CountAncillaryData(), 0);
+			CHECK_EQ(pktsC.CountAncillaryData(), 1024);
+		}	//	TEST_CASE("BFT_AncDataCompare")
+#endif	//	defined(AJA_USE_CPLUSPLUS11)
+
+
 //	This explicitly tests AJAAncillaryData::GenerateTransmitData:
 #if 0
 static bool GenerateIPPacketWordsBFT (void)