Merged r53751, r41955, r47793, r47794, r47797, r62595 from trunk; fixes #865

[SVN r62596]

include/boost/concept/usage.hpp

@@ -6,8 +6,9 @@
 
 # include <boost/concept/assert.hpp>
 # include <boost/detail/workaround.hpp>
+# include <boost/concept/detail/backward_compatibility.hpp>
 
-namespace boost { namespace concept { 
+namespace boost { namespace concepts { 
 
 # if BOOST_WORKAROUND(__GNUC__, == 2)
 
@@ -25,19 +26,19 @@ struct usage_requirements
 
 #   define BOOST_CONCEPT_USAGE(model)                                    \
       model(); /* at least 2.96 and 3.4.3 both need this :( */           \
-      BOOST_CONCEPT_ASSERT((boost::concept::usage_requirements<model>)); \
+      BOOST_CONCEPT_ASSERT((boost::concepts::usage_requirements<model>)); \
       ~model()
 
 #  else
 
 #   define BOOST_CONCEPT_USAGE(model)                                    \
-      BOOST_CONCEPT_ASSERT((boost::concept::usage_requirements<model>)); \
+      BOOST_CONCEPT_ASSERT((boost::concepts::usage_requirements<model>)); \
       ~model()
 
 #  endif
 
 # endif 
 
-}} // namespace boost::concept
+}} // namespace boost::concepts
 
 #endif // BOOST_CONCEPT_USAGE_DWA2006919_HPP