File atmos-r269.diff of Package atmos

File atmos-r269.diff of Package atmos (Revision 16)

Currently displaying revision 16 , Show latest

--- configure.in	(revision 259)
+++ configure.in	(revision 269)
@@ -47,6 +47,7 @@
 
 AC_CHECK_HEADERS([boost/math/tools/roots.hpp \
 	boost/math/tools/tuple.hpp \
+	boost/functional/value_factory.hpp \
 	tr1/tuple])
 
 AC_CHECK_HEADERS([gsl/gsl_errno.h \
--- src/caching_factory.h	(revision 259)
+++ src/caching_factory.h	(revision 269)
@@ -25,8 +25,19 @@
 
 #include <map>
 
-#include <boost/functional/value_factory.hpp>
+#ifdef HAVE_CONFIG_H
+# include "config.h" 
+#else
+# define HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
+#endif
 
+#ifdef HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
+# include <boost/functional/value_factory.hpp>
+# define DEFAULT_CREATE_FACTORY_TOKEN =boost::value_factory<T>
+#else
+# define DEFAULT_CREATE_FACTORY_TOKEN
+#endif
+
 #include <boost/preprocessor/arithmetic/inc.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
@@ -35,7 +46,8 @@
 namespace utils {
 namespace algo {
 
-template< class T, class Key, class Create = boost::value_factory<T>, class Container = std::map<Key,T> > class caching_factory {
+template< class T, class Key, class Create DEFAULT_CREATE_FACTORY_TOKEN, class Container = std::map<Key,T> > class caching_factory {
+#undef DEFAULT_CREATE_FACTORY_TOKEN
 public:
 	typedef T       value_type;
 	typedef Key     key_type;