PbiStream: add missing ctors

Author: dbahrdt

osmpbf/include/osmpbf/pbistream.h

@@ -81,8 +81,8 @@ class MultiFilePbiStream: public interface::PbiStream {
 
 class PbiStream {
 public:
-	PbiStream() = default;
-	PbiStream(PbiStream && other) = default;
+	PbiStream();
+	PbiStream(PbiStream && other);
 	PbiStream(OSMFileIn && fileIn);
 	PbiStream(std::vector<OSMFileIn> && files);
 	PbiStream(const std::vector<std::string> & fileNames);
@@ -175,4 +175,4 @@ PbiStream::PbiStream(T_OSMFILE_IN_ITERATOR begin, T_OSMFILE_IN_ITERATOR end)
 
 }
 
-#endif
+#endif

osmpbf/pbistream.cpp

@@ -198,9 +198,20 @@ MultiFilePbiStream::parseNext(PrimitiveBlockInputAdaptor& adaptor) {
 
 }//end namespace imp
 
+
+PbiStream::PbiStream() {}
+
+PbiStream::PbiStream(PbiStream && other) :
+m_priv(std::move(other.m_priv))
+{}
+
+PbiStream::PbiStream(OSMFileIn && fileIn) :
+m_priv(std::make_unique<imp::SingleFilePbiStream>(std::move(fileIn)))
+{}
+
 PbiStream::PbiStream(std::vector<OSMFileIn> && files) {
 	if (files.size()) {
-		m_priv.reset(new imp::MultiFilePbiStream(files.begin(), files.end()));
+		m_priv = std::make_unique<imp::MultiFilePbiStream>(files.begin(), files.end());
 		files.clear();
 	}
 }
@@ -299,4 +310,4 @@ PbiStream::parseNextBlock(PrimitiveBlockInputAdaptor & adaptor) {
 	return parseNext(adaptor);
 }
 
-}//end namespace osmpbf
+}//end namespace osmpbf