Modify

Opened 6 years ago

Closed 6 years ago

Last modified 5 years ago

#6293 closed Patches (fixed)

Remove deprecated function_requires in the BGL

Reported by: ich@… Owned by: jewillco
Milestone: To Be Determined Component: graph
Version: Boost Development Trunk Severity: Cosmetic
Keywords: Cc:

Description

The attached patch:

  • clarifies that function_requires is replaced by BOOST_CONCEPT_ASSERT in the docs of the Concept Checking library
  • replaces function_requires by BOOST_CONCEPT_ASSERT in all files of the Boost Graph library, including headers, examples, tests, and the documentation
  • adds #include <boost/concept/assert.hpp> to all files using BOOST_CONCEPT_ASSERT

Attachments (1)

graph-library-boost-concept-assert.patch (133.3 KB) - added by ich@… 6 years ago.
replaces function_requires by BOOST_CONCEPT_ASSERT

Download all attachments as: .zip

Change History (8)

Changed 6 years ago by ich@…

replaces function_requires by BOOST_CONCEPT_ASSERT

comment:1 Changed 6 years ago by ich@…

Sorry, I still have a problem in boost/graph/bron_kerbosch_all_cliques.hpp ... Don't apply yet ...

comment:2 Changed 6 years ago by ich@…

When building the tests, I get:

boost-trunk/libs/graph/test$ ../../../tools/build/v2/bjam
Performing configuration checks

    - has_icu builds           : yes
...patience...
...patience...
...patience...
...found 6492 targets...
...updating 4 targets...
gcc.compile.c++ ../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug/bron_kerbosch_all_cliques.o
In file included from bron_kerbosch_all_cliques.cpp:16:0:
../../../boost/graph/bron_kerbosch_all_cliques.hpp: In Funktion »void boost::bron_kerbosch_all_cliques(const Graph&, Visitor, std::size_t)«:
../../../boost/graph/bron_kerbosch_all_cliques.hpp:272:5: Fehler: »BOOST_CONCEPT_ASSERT« wurde in diesem Gültigkeitsbereich nicht definiert
../../../boost/graph/bron_kerbosch_all_cliques.hpp:272:56: Fehler: expected primary-expression before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:272:56: Fehler: expected »;« before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:273:57: Fehler: expected primary-expression before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:273:57: Fehler: expected »;« before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:274:58: Fehler: expected primary-expression before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:274:58: Fehler: expected »;« before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:275:57: Fehler: expected primary-expression before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:275:57: Fehler: expected »;« before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:280:70: Fehler: expected primary-expression before »)« token
../../../boost/graph/bron_kerbosch_all_cliques.hpp:280:70: Fehler: expected »;« before »)« token

    "g++"  -ftemplate-depth-128 -O0 -fno-inline -Wall -g -fPIC  -DBOOST_ALL_NO_LIB=1  -I"../../.." -c -o "../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug/bron_kerbosch_all_cliques.o" "bron_kerbosch_all_cliques.cpp"

...failed gcc.compile.c++ ../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug/bron_kerbosch_all_cliques.o...
...skipped <p../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug>bron_kerbosch_all_cliques for lack of <p../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug>bron_kerbosch_all_cliques.o...
...skipped <p../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug>bron_kerbosch_all_cliques.run for lack of <p../../../bin.v2/libs/graph/test/bron_kerbosch_all_cliques.test/gcc-4.6.1/debug>bron_kerbosch_all_cliques...
...failed updating 1 target...
...skipped 3 targets...

I don't really know the reason ...

comment:3 Changed 6 years ago by jewillco

I applied your patch to my checkout, and I'll try to get it working and commit it.

comment:4 Changed 6 years ago by jewillco

The fix was just to change BOOST_CONCEPT_ASSERT< in a few places to BOOST_CONCEPT_ASSERT((. I will commit your changes to the trunk soon.

comment:5 Changed 6 years ago by ich@…

Umm, so that was a stupid one, sorry about that. I saw to many parentheses and angle brackets in the last hour ...

comment:6 Changed 6 years ago by jewillco

  • Resolution set to fixed
  • Status changed from new to closed

(In [76050]) Applied fixed version of patch from #6293; fixes #6293

comment:7 Changed 5 years ago by jewillco

(In [76535]) Merged r76050, r75547, r75891, r76049, r76083, and r76439 from trunk (reverse_graph bug fixes and fix for #6293); refs #6293

Add Comment

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain jewillco.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.