diff --git a/Makefile.am b/Makefile.am index 779b29b7..fce8e76f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) +AM_CXXFLAGS = AM_DEFAULT_SOURCE_EXT = .cpp ############################################################################### @@ -368,7 +368,7 @@ EXTRA_DIST += ${top_srcdir}/build-aux/wine-crlf.sh ############################################################################### ## Utility programs -LDADD = $(top_builddir)/libcruft-util.a $(BOOST_LDFLAGS) $(LIBS) +LDADD = $(top_builddir)/libcruft-util.a $(LIBS) bin_PROGRAMS = \ tools/json-clean \ diff --git a/configure.ac b/configure.ac index ea7c8e78..66a523ff 100644 --- a/configure.ac +++ b/configure.ac @@ -101,10 +101,6 @@ NC_DEBUGGING CHECK_RAGEL([ip.cpp]) -NC_BOOST([1.53], [system thread]) -AC_SUBST(BOOST_CPPFLAGS) -AC_SUBST(BOOST_LDFLAGS) - ############################################################################### ## Optional packages diff --git a/stringid.cpp b/stringid.cpp index 18a734c2..fbf8e385 100644 --- a/stringid.cpp +++ b/stringid.cpp @@ -19,8 +19,7 @@ #include "raii.hpp" #include -#include -#include +#include using util::stringid; @@ -32,8 +31,8 @@ stringid::add (const std::string key) { if (pos != m_map.end ()) throw std::invalid_argument ("duplicate stringid key"); - static boost::mutex s_lock; - boost::lock_guard raii (s_lock); + static std::mutex s_lock; + std::lock_guard guard (s_lock); id_t id = m_map.size (); m_map[key] = id;