diff options
| author | Richard A. Kirian <rkirian@asu.edu> | 2012-01-29 02:00:44 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:45 +0100 |
| commit | 83a67ef5a39abbebe1b5a6f470403aa9b57e046e (patch) | |
| tree | 55d7c109fc47824eb2c20422551daea2c70bc261 | |
| parent | 5ab26bafd351cc8ac412ce5993c9ddedf34c6683 (diff) | |
cell.h: change variable "template" to "tempcell" (c++ conflict)
| -rw-r--r-- | libcrystfel/src/cell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcrystfel/src/cell.h b/libcrystfel/src/cell.h index b5d31fc6..72c0b6df 100644 --- a/libcrystfel/src/cell.h +++ b/libcrystfel/src/cell.h @@ -95,10 +95,10 @@ extern UnitCell *rotate_cell(UnitCell *in, double omega, double phi, extern void cell_print(UnitCell *cell); -extern UnitCell *match_cell(UnitCell *cell, UnitCell *template, int verbose, +extern UnitCell *match_cell(UnitCell *cell, UnitCell *tempcell, int verbose, int reduce); -extern UnitCell *match_cell_ab(UnitCell *cell, UnitCell *template); +extern UnitCell *match_cell_ab(UnitCell *cell, UnitCell *tempcell); extern UnitCell *load_cell_from_pdb(const char *filename); |