Remove compose.hpp dependency from header.

diff --git a/src/exceptions.cc b/src/exceptions.cc
new file mode 100644 (file)
index 0000000..6a32a33
--- /dev/null
+++ b/src/exceptions.cc
@@ -0,0 +1,33 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "exceptions.h"
+#include "compose.hpp"
+
+using std::string;
+using namespace libdcp;
+
+FileError::FileError (std::string const & message, boost::filesystem::path filename, int number)
+       : _message (String::compose ("%1 (error %2) (%3)", message, filename.string(), number))
+       , _filename (filename)
+       , _number (number)
+{
+
+}
+

diff --git a/src/exceptions.h b/src/exceptions.h
index 602aa16bd24e25e42d2923fd7637b83a634567d5..2070dd0fa44d38cb3f2b682790a827d9ad5c3d2f 100644 (file)
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -21,7 +21,6 @@
 #define LIBDCP_EXCEPTIONS_H
 
 #include <boost/filesystem.hpp>
-#include "compose.hpp"
 
 /** @file  src/exceptions.h
  *  @brief Exceptions thrown by libdcp.
@@ -34,12 +33,7 @@ namespace libdcp
 class FileError : public std::exception
 {
 public:
-       FileError (std::string const & message, boost::filesystem::path filename, int number)
-               : _message (String::compose ("%1 (error %2) (%3)", message, filename.string(), number))
-               , _filename (filename)
-               , _number (number)
-       {}
-                           
+       FileError (std::string const & message, boost::filesystem::path filename, int number);
        ~FileError () throw () {}
 
        /** @return error message */

diff --git a/src/wscript b/src/wscript
index 1d694ec3f84ae21fae0f6c5e8546bb3dab1e9714..cdf3c0620973dc08365d9080a453b022b2e4bc83 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -19,6 +19,7 @@ def build(bld):
                  cpl.cc
                  dcp.cc        
                  dcp_time.cc
+                 exceptions.cc
                  gamma_lut.cc
                  image.cc
                  kdm.cc