← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scotch/trusty-proposed

« back to all changes in this revision

Viewing changes to src/libscotch/kgraph_map_rb.c

  • Committer: Bazaar Package Importer
  • Author(s): "Adam C. Powell, IV", Christophe Trophime, Adam C. Powell, IV
  • Date: 2010-12-29 13:07:19 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20101229130719-jwalolw5d6av6wqx
Tags: 5.1.11.dfsg-1
[Christophe Trophime]
* New upstream release
* Forward-ported patches to version 5.1.10b.
* Install scotch headers properly.
* Fix chrpath commands in debian/rules.
* Fix (pt)scotch library install paths.
* Fix lintian errors and warnings.

[Adam C. Powell, IV]
* Forward-ported patches to version 5.1.11.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libscotch/kgraph_map_rb.c
106
106
Kgraph * restrict const                 grafptr,
107
107
const KgraphMapRbParam * restrict const paraptr)
108
108
{
109
 
  return (archPart (&grafptr->m.archdat)
110
 
          ? kgraphMapRbPart (grafptr, paraptr)
111
 
          : kgraphMapRbMap  (grafptr, paraptr));
 
109
  int                 o;
 
110
 
 
111
  o = (archPart (&grafptr->m.archdat) ? kgraphMapRbPart : kgraphMapRbMap) (grafptr, paraptr);
 
112
  if (o != 0)
 
113
    return (o);
 
114
 
 
115
#ifdef SCOTCH_DEBUG_KGRAPH2
 
116
  if (kgraphCheck (grafptr) != 0) {
 
117
    errorPrint ("kgraphMapRb: inconsistent graph data");
 
118
    return     (1);
 
119
  }
 
120
#endif /* SCOTCH_DEBUG_KGRAPH2 */
 
121
 
 
122
  return (o);
112
123
}