Merge 25acd91cc8 into 654520d0d4

cpp/QrSegment.cpp

@@ -129,6 +129,13 @@ qrcodegen::QrSegment::QrSegment(const Mode &md, int numCh, const std::vector<uin
 }
 
 
+qrcodegen::QrSegment & qrcodegen::QrSegment::operator=(const QrSegment &seg)
+{
+	QrSegment(seg.mode, seg.numChars, seg.data, seg.bitLength);
+	return *this;
+}
+
+
 int qrcodegen::QrSegment::getTotalBits(const std::vector<QrSegment> &segs, int version) {
 	if (version < 1 || version > 40)
 		throw "Version number out of range";

cpp/QrSegment.hpp

@@ -27,6 +27,9 @@
 #include <cstdint>
 #include <vector>
 
+#if defined(_MSC_VER) && _MSC_VER < 1800
+#define final
+#endif
 
 namespace qrcodegen {
 
@@ -144,6 +147,8 @@ class QrSegment final {
 	 */
 	public: QrSegment(const Mode &md, int numCh, const std::vector<uint8_t> &b, int bitLen);
 	
+	// Required in the instantiation of std::vector<QrSegment>.
+	QrSegment &operator=(const QrSegment &seg);
 	
 	// Package-private helper function.
 	public: static int getTotalBits(const std::vector<QrSegment> &segs, int version);