Tweak to build onboost filesystem v2

diff --git a/src/asset.cc b/src/asset.cc
index de299d34a93b914bfd487a12a3fb9e88c1b11d10..92b235d88ca63ca59ae67bc9741ca2e22896cc96 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -122,9 +122,14 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                        notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ");
                        return notes;
                }
-               
+
+#if BOOST_FILESYSTEM_VERSION == 3
                ifstream a (mxf_path().c_str(), ios::binary);
                ifstream b (other->mxf_path().c_str(), ios::binary);
+#else
+               ifstream a (mxf_path().string().c_str(), ios::binary);
+               ifstream b (other->mxf_path().string().c_str(), ios::binary);
+#endif         
 
                int buffer_size = 65536;
                char abuffer[buffer_size];

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index d94561948f897fc34e258816e68681a7072a1d86..14a9eda63806d2e0fdcf8fe7e8501614dfed1a90 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -100,7 +100,11 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        fill_writer_info (&writer_info);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
+#if BOOST_FILESYSTEM_VERSION == 3      
        if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) {
+#else          
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) {
+#endif         
                throw FileError ("could not open MXF file for writing", mxf_path().string());
        }
 
@@ -147,12 +151,20 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                     
        if (flags & MXF_INSPECT) {
                ASDCP::JP2K::MXFReader reader_A;
+#if BOOST_FILESYSTEM_VERSION == 3              
                if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) {
+#else                  
+               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) {
+#endif                 
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 
                ASDCP::JP2K::MXFReader reader_B;
+#if BOOST_FILESYSTEM_VERSION == 3              
                if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) {
+#else                  
+               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) {
+#endif                 
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 9a738a08f89d8e4a7e45444e694c9de37dc017e8..fdb7c66246bc84164076adc2d5344faca20a1f94 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -120,7 +120,11 @@ SoundAsset::construct (sigc::slot<string, Channel> get_path)
        fill_writer_info (&writer_info);
 
        ASDCP::PCM::MXFWriter mxf_writer;
+#if BOOST_FILESYSTEM_VERSION == 3
        if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, audio_desc))) {
+#else          
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, audio_desc))) {
+#endif         
                throw FileError ("could not open audio MXF for writing", mxf_path().string());
        }
 
@@ -183,13 +187,21 @@ SoundAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                     
        if (flags & MXF_INSPECT) {
                ASDCP::PCM::MXFReader reader_A;
+#if BOOST_FILESYSTEM_VERSION == 3              
                if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) {
+#else                  
+               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) {
+#endif                 
                        cout << "failed " << mxf_path() << "\n";
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 
                ASDCP::PCM::MXFReader reader_B;
+#if BOOST_FILESYSTEM_VERSION == 3              
                if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) {
+#else                  
+               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) {
+#endif                 
                        cout << "failed " << other->mxf_path() << "\n";
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index df5eb3d00444ee0a079a0017136bfa0e37d92d56..9d4243331a215a638f5ed3ef4e0e6507ea584423 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -1,3 +1,4 @@
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <getopt.h>
 #include "dcp.h"