[med-svn] r5097 - trunk/packages/autodocksuite/trunk/debian/patches
Steffen Möller
moeller at alioth.debian.org
Mon Aug 2 21:03:19 UTC 2010
Author: moeller
Date: 2010-08-02 21:03:02 +0000 (Mon, 02 Aug 2010)
New Revision: 5097
Added:
trunk/packages/autodocksuite/trunk/debian/patches/const_manual_60.patch
Modified:
trunk/packages/autodocksuite/trunk/debian/patches/const_manual_55.patch
trunk/packages/autodocksuite/trunk/debian/patches/series
Log:
More "const"s introduced.
Modified: trunk/packages/autodocksuite/trunk/debian/patches/const_manual_55.patch
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/const_manual_55.patch 2010-08-02 13:53:14 UTC (rev 5096)
+++ trunk/packages/autodocksuite/trunk/debian/patches/const_manual_55.patch 2010-08-02 21:03:02 UTC (rev 5097)
@@ -30,3 +30,315 @@
+ /* not const */ int isort[MAX_RUNS],
+ const int nconf );
#endif
+Index: autodocksuite-4.2.3/autodock/quicksort.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/quicksort.cc 2010-08-01 22:21:07.000000000 +0200
++++ autodocksuite-4.2.3/autodock/quicksort.cc 2010-08-01 22:22:01.000000000 +0200
+@@ -45,10 +45,10 @@
+ extern FILE *logFile;
+ #endif /* DEBUG */
+
+-void quicksort( Real e[],
+- int isort[],
+- int left,
+- int right )
++void quicksort( const Real e[],
++ /* not const */ int isort[],
++ const int left,
++ const int right )
+
+ {
+ int i, last;
+Index: autodocksuite-4.2.3/autodock/quicksort.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/quicksort.h 2010-08-01 22:21:07.000000000 +0200
++++ autodocksuite-4.2.3/autodock/quicksort.h 2010-08-01 22:22:34.000000000 +0200
+@@ -29,8 +29,8 @@
+ #include "swap.h"
+ #include "typedefs.h"
+
+-void quicksort( Real e[],
+- int isort[],
+- int left,
+- int right );
++void quicksort( const Real e[],
++ /* not const */ int isort[],
++ const int left,
++ const int right );
+ #endif
+Index: autodocksuite-4.2.3/autodock/readfield.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/readfield.cc 2010-08-01 22:18:24.000000000 +0200
++++ autodocksuite-4.2.3/autodock/readfield.cc 2010-08-01 22:19:07.000000000 +0200
+@@ -39,8 +39,8 @@
+ extern FILE *logFile;
+
+ //FIXME: tms_jobStart could be passed by reference
+-void readfield( GridMapSetInfo *info,
+- char line[LINE_LEN],
++void readfield( /* not const */ GridMapSetInfo *const info,
++ /* not const */ char line[LINE_LEN],
+ const Clock jobStart,
+ const struct tms tms_jobStart )
+
+Index: autodocksuite-4.2.3/autodock/readfield.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/readfield.h 2010-08-01 22:18:24.000000000 +0200
++++ autodocksuite-4.2.3/autodock/readfield.h 2010-08-01 22:20:16.000000000 +0200
+@@ -52,10 +52,10 @@
+ struct tms tms_jobStart );
+ */
+
+-void readfield( GridMapSetInfo *info, // *ptr_map_set_info
+- char line[LINE_LEN],
+- Clock jobStart,
+- struct tms tms_jobStart );
++void readfield( GridMapSetInfo *const info, // *ptr_map_set_info
++ /* not const */ char line[LINE_LEN],
++ const Clock jobStart,
++ const struct tms tms_jobStart );
+
+
+ #endif
+Index: autodocksuite-4.2.3/autodock/stack.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/stack.cc 2010-08-01 22:10:25.000000000 +0200
++++ autodocksuite-4.2.3/autodock/stack.cc 2010-08-01 22:11:18.000000000 +0200
+@@ -19,7 +19,7 @@
+ return s;
+ }
+
+-int stack_pop(stack s)
++int stack_pop(/* not const */ stack s)
+ {
+ (s->top)--;
+ if (s->top < 0) {
+@@ -34,7 +34,7 @@
+ return s->base[s->top];
+ }
+
+-void stack_push(stack s, const int i)
++void stack_push(/* not const */ stack s, const int i)
+ {
+ if (s->trace != NULL) fprintf(s->trace, "Stack(%d/%d) push %d\n",
+ s->top, s->size,i);
+Index: autodocksuite-4.2.3/autodock/stateLibrary.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/stateLibrary.cc 2010-08-01 22:11:30.000000000 +0200
++++ autodocksuite-4.2.3/autodock/stateLibrary.cc 2010-08-01 22:14:15.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ extern FILE *logFile;
+
+-void initialiseState( State *S )
++void initialiseState( /* not const */ State *const S )
+ {
+ register int i;
+ S->T.x = 0.0;
+@@ -48,7 +48,7 @@
+ }
+ }
+
+-void initialiseQuat( Quat *Q )
++void initialiseQuat( /* not const */ Quat *const Q )
+ {
+ Q->nx = 1.0;
+ Q->ny = 0.0;
+@@ -61,7 +61,7 @@
+ Q->qmag = 1.0;
+ }
+
+-void copyState( State *D, /* Destination -- copy to here */
++void copyState( /* not const */ State *const D, /* Destination -- copy to here */
+ const State S ) /* Source -- copy this. */
+ {
+ register int i;
+@@ -189,7 +189,7 @@
+ // (void)fprintf( fp, "\n");
+ }
+
+-int checkState( const State *D )
++int checkState( const State *const D )
+ {
+ register int i;
+ int retval = 1;
+@@ -259,7 +259,7 @@
+ return(retval);
+ }
+
+-Molecule copyStateToMolecule(const State *const S, Molecule *const mol) /* S is the source */
++Molecule copyStateToMolecule(const State *const S, /* not const */ Molecule *const mol) /* S is the source */
+ {
+ register int i;
+ mol->S.T.x = S->T.x;
+Index: autodocksuite-4.2.3/autodock/stateLibrary.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/stateLibrary.h 2010-08-01 22:11:30.000000000 +0200
++++ autodocksuite-4.2.3/autodock/stateLibrary.h 2010-08-01 22:16:05.000000000 +0200
+@@ -30,21 +30,21 @@
+ #include "structs.h"
+ #include "constants.h"
+
+-void initialiseState( State *S );
++void initialiseState( /* not const */ State *const S );
+
+-void initialiseQuat( Quat *Q );
++void initialiseQuat( /* not const */ Quat *const Q );
+
+-void copyState( State *destination,
++void copyState( State *const destination,
+ const State source);
+
+ void printState( FILE *const fp,
+ /* not const */ State state,
+ const int detail );
+
+-void writeState( FILE *const fp,
++void writeState( /* not const */ FILE *const fp,
+ /* not const */ State state );
+
+-int checkState( const State *D );
++int checkState( const State *const D );
+
+-Molecule copyStateToMolecule(const State *const source, Molecule *const mol);
++Molecule copyStateToMolecule(const State *const source, /* not const */ Molecule *const mol);
+ #endif
+Index: autodocksuite-4.2.3/autodock/stop.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/stop.cc 2010-08-01 22:17:04.000000000 +0200
++++ autodocksuite-4.2.3/autodock/stop.cc 2010-08-01 22:17:19.000000000 +0200
+@@ -40,7 +40,7 @@
+
+
+ /*----------------------------------------------------------------------------*/
+-void stop(const char *reason)
++void stop(const char *const reason)
+ /*----------------------------------------------------------------------------*/
+ {
+
+Index: autodocksuite-4.2.3/autodock/stop.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/stop.h 2010-08-01 22:17:04.000000000 +0200
++++ autodocksuite-4.2.3/autodock/stop.h 2010-08-01 22:17:28.000000000 +0200
+@@ -30,5 +30,5 @@
+ #include "constants.h"
+ #include "print_2x.h"
+
+-void stop(const char* reason);
++void stop(const char *const reason);
+ #endif
+Index: autodocksuite-4.2.3/autodock/weedbonds.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/weedbonds.cc 2010-08-01 22:23:19.000000000 +0200
++++ autodocksuite-4.2.3/autodock/weedbonds.cc 2010-08-01 22:29:48.000000000 +0200
+@@ -40,16 +40,16 @@
+ extern int Nnb_array[3];
+
+
+-void weedbonds( int natom,
+- char pdbaname[MAX_ATOMS][5],
+- int rigid_piece[MAX_ATOMS],
+- int ntor,
+- int tlist[MAX_TORS][MAX_ATOMS],
+- int nbmatrix[MAX_ATOMS][MAX_ATOMS],
+- int *Addr_Nnb,
+- NonbondParam *nonbondlist,
+- int outlev,
+- int type[MAX_ATOMS] )
++void weedbonds( const int natom,
++ const char pdbaname[MAX_ATOMS][5],
++ const int rigid_piece[MAX_ATOMS],
++ const int ntor,
++ const int tlist[MAX_TORS][MAX_ATOMS],
++ /* not const */ int nbmatrix[MAX_ATOMS][MAX_ATOMS],
++ /* not const */ int *const Addr_Nnb,
++ /* not const */ NonbondParam *nonbondlist,
++ const int outlev,
++ const int type[MAX_ATOMS] )
+
+ {
+ int a11=0;
+@@ -233,16 +233,16 @@
+
+
+ void print_nonbonds(
+- int natom,
+- char pdbaname[MAX_ATOMS][5],
+- int rigid_piece[MAX_ATOMS],
+- int ntor,
+- int tlist[MAX_TORS][MAX_ATOMS],
+- int nbmatrix[MAX_ATOMS][MAX_ATOMS],
+- int Nnb,
+- NonbondParam *nonbondlist,
+- int outlev,
+- int type[MAX_ATOMS])
++ const int natom,
++ const char pdbaname[MAX_ATOMS][5],
++ const int rigid_piece[MAX_ATOMS],
++ const int ntor,
++ const int tlist[MAX_TORS][MAX_ATOMS],
++ /* not const */ int nbmatrix[MAX_ATOMS][MAX_ATOMS],
++ const int Nnb,
++ const NonbondParam *const nonbondlist,
++ const int outlev,
++ const int type[MAX_ATOMS])
+
+ {
+ register int i = 0;
+Index: autodocksuite-4.2.3/autodock/weedbonds.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/weedbonds.h 2010-08-01 22:23:19.000000000 +0200
++++ autodocksuite-4.2.3/autodock/weedbonds.h 2010-08-01 22:29:32.000000000 +0200
+@@ -31,16 +31,16 @@
+ #include "stop.h"
+ #include "structs.h"
+
+-void weedbonds( int natom,
+- char pdbaname[MAX_ATOMS][5],
+- int piece[MAX_ATOMS],
+- int ntor,
+- int tlist[MAX_TORS][MAX_ATOMS],
+- int nbmatrix_binary[MAX_ATOMS][MAX_ATOMS],
+- int *P_Nnb,
+- NonbondParam *nonbondlist,
+- int outlev,
+- int type[MAX_ATOMS]);
++void weedbonds( const int natom,
++ const char pdbaname[MAX_ATOMS][5],
++ const int piece[MAX_ATOMS],
++ const int ntor,
++ const int tlist[MAX_TORS][MAX_ATOMS],
++ /* not const */ int nbmatrix_binary[MAX_ATOMS][MAX_ATOMS],
++ /* not const */ int *P_Nnb,
++ /* not const */ NonbondParam *const nonbondlist,
++ const int outlev,
++ const int type[MAX_ATOMS]);
+ #endif
+
+
+@@ -52,15 +52,15 @@
+ #include "structs.h"
+
+ void print_nonbonds(
+- int natom,
+- char pdbaname[MAX_ATOMS][5],
+- int piece[MAX_ATOMS],
+- int ntor,
+- int tlist[MAX_TORS][MAX_ATOMS],
+- int nbmatrix[MAX_ATOMS][MAX_ATOMS],
+- int Nnb,
+- NonbondParam *nonbondlist,
+- int outlev,
+- int type[MAX_ATOMS]);
++ const int natom,
++ const char pdbaname[MAX_ATOMS][5],
++ const int piece[MAX_ATOMS],
++ const int ntor,
++ const int tlist[MAX_TORS][MAX_ATOMS],
++ /* not const */ int nbmatrix[MAX_ATOMS][MAX_ATOMS],
++ const int Nnb,
++ const NonbondParam *nonbondlist,
++ const int outlev,
++ const int type[MAX_ATOMS]);
+ #endif
+
Added: trunk/packages/autodocksuite/trunk/debian/patches/const_manual_60.patch
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/const_manual_60.patch (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/patches/const_manual_60.patch 2010-08-02 21:03:02 UTC (rev 5097)
@@ -0,0 +1,381 @@
+Index: autodocksuite-4.2.3/autodock/parse_dpf_line.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_dpf_line.cc 2010-08-02 22:42:26.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_dpf_line.cc 2010-08-02 22:42:32.000000000 +0200
+@@ -35,7 +35,7 @@
+
+
+
+-int parse_dpf_line( char line[LINE_LEN] )
++int parse_dpf_line( const char line[LINE_LEN] )
+
+ /******************************************************************************/
+ /* Name: parse_dpf_line */
+Index: autodocksuite-4.2.3/autodock/parse_dpf_line.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_dpf_line.h 2010-08-02 22:42:26.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_dpf_line.h 2010-08-02 22:42:36.000000000 +0200
+@@ -28,6 +28,6 @@
+ #define PARSE_DPF_LINE
+
+ #include "constants.h"
+-int parse_dpf_line( char line[LINE_LEN] );
++int parse_dpf_line( const char line[LINE_LEN] );
+
+ #endif
+Index: autodocksuite-4.2.3/autodock/parse_param_line.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_param_line.cc 2010-08-02 22:42:00.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_param_line.cc 2010-08-02 22:42:11.000000000 +0200
+@@ -36,7 +36,7 @@
+ extern int debug;
+ extern FILE *logFile;
+
+-int parse_param_line( char line[LINE_LEN] )
++int parse_param_line( const char line[LINE_LEN] )
+
+ /******************************************************************************/
+ /* Name: parse_param_line */
+Index: autodocksuite-4.2.3/autodock/parse_param_line.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_param_line.h 2010-08-02 22:42:00.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_param_line.h 2010-08-02 22:42:17.000000000 +0200
+@@ -28,6 +28,6 @@
+ #define PARSE_PAR_LINE
+
+ #include "constants.h"
+-int parse_param_line( char line[LINE_LEN] );
++int parse_param_line( const char line[LINE_LEN] );
+
+ #endif
+Index: autodocksuite-4.2.3/autodock/parse_trj_line.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_trj_line.cc 2010-08-02 22:41:25.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_trj_line.cc 2010-08-02 22:41:35.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include "trjtokens.h"
+
+
+-int parse_trj_line( char line[LINE_LEN] )
++int parse_trj_line( const char line[LINE_LEN] )
+
+ /******************************************************************************/
+ /* Name: parse_trj_line */
+Index: autodocksuite-4.2.3/autodock/parse_trj_line.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parse_trj_line.h 2010-08-02 22:41:26.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parse_trj_line.h 2010-08-02 22:41:40.000000000 +0200
+@@ -29,5 +29,5 @@
+ #include "constants.h"
+ #include "strindex.h"
+
+-int parse_trj_line( char line[LINE_LEN] );
++int parse_trj_line( const char line[LINE_LEN] );
+ #endif
+Index: autodocksuite-4.2.3/autodock/parsetypes.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parsetypes.cc 2010-08-02 22:40:15.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parsetypes.cc 2010-08-02 22:41:03.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include <ctype.h>
+ #include "parsetypes.h"
+
+-int parsetypes(char * line, char *words[], int maxwords)
++int parsetypes(const char *const line, char *words[], const int maxwords)
+ /*utility func for parsing types*/
+ {
+ /******************************************************************************/
+Index: autodocksuite-4.2.3/autodock/parsetypes.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/parsetypes.h 2010-08-02 22:40:15.000000000 +0200
++++ autodocksuite-4.2.3/autodock/parsetypes.h 2010-08-02 22:41:15.000000000 +0200
+@@ -27,7 +27,7 @@
+ #ifndef _PARSETYPES
+ #define _PARSETYPES
+
+-int parsetypes(char * line, char *words[], int maxwords);
++int parsetypes(const char *const line, char *words[], const int maxwords);
+
+ #endif
+
+Index: autodocksuite-4.2.3/autodock/prClusterHist.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/prClusterHist.cc 2010-08-02 22:38:50.000000000 +0200
++++ autodocksuite-4.2.3/autodock/prClusterHist.cc 2010-08-02 22:39:16.000000000 +0200
+@@ -36,14 +36,14 @@
+
+ extern FILE *logFile;
+
+-void prClusterHist( int ncluster,
+- int irunmax,
+- Real clus_rms_tol,
+- int num_in_clu[MAX_RUNS],
+- int cluster[MAX_RUNS][MAX_RUNS],
+- Real econf[MAX_RUNS],
+- Real clu_rms[MAX_RUNS][MAX_RUNS],
+- Real ref_rms[MAX_RUNS])
++void prClusterHist( const int ncluster,
++ const int irunmax,
++ const Real clus_rms_tol,
++ const int num_in_clu[MAX_RUNS],
++ const int cluster[MAX_RUNS][MAX_RUNS],
++ const Real econf[MAX_RUNS],
++ const Real clu_rms[MAX_RUNS][MAX_RUNS],
++ const Real ref_rms[MAX_RUNS])
+ {
+ Real etot = 0.,
+ eavg = 0.;
+Index: autodocksuite-4.2.3/autodock/prClusterHist.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/prClusterHist.h 2010-08-02 22:38:50.000000000 +0200
++++ autodocksuite-4.2.3/autodock/prClusterHist.h 2010-08-02 22:39:24.000000000 +0200
+@@ -29,12 +29,12 @@
+
+ #include "constants.h"
+
+-void prClusterHist(int ncluster,
+- int irunmax,
+- Real clus_rms_tol,
+- int num_in_clu[MAX_RUNS],
+- int cluster[MAX_RUNS][MAX_RUNS],
+- Real econf[MAX_RUNS],
+- Real clu_rms[MAX_RUNS][MAX_RUNS],
+- Real ref_rms[MAX_RUNS]);
++void prClusterHist(const int ncluster,
++ const int irunmax,
++ const Real clus_rms_tol,
++ const int num_in_clu[MAX_RUNS],
++ const int cluster[MAX_RUNS][MAX_RUNS],
++ const Real econf[MAX_RUNS],
++ const Real clu_rms[MAX_RUNS][MAX_RUNS],
++ const Real ref_rms[MAX_RUNS]);
+ #endif
+Index: autodocksuite-4.2.3/autodock/prTorConList.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/prTorConList.cc 2010-08-02 22:32:56.000000000 +0200
++++ autodocksuite-4.2.3/autodock/prTorConList.cc 2010-08-02 22:34:07.000000000 +0200
+@@ -39,11 +39,11 @@
+
+ extern FILE *logFile;
+
+-void prTorConList( int ntor,
+- Boole B_isTorConstrained[MAX_TORS],
+- unsigned short US_torProfile[MAX_TORS][NTORDIVS],
+- Real F_TorConRange[MAX_TORS][MAX_TOR_CON][2],
+- int N_con[MAX_TORS])
++void prTorConList( const int ntor,
++ const Boole B_isTorConstrained[MAX_TORS],
++ const unsigned short US_torProfile[MAX_TORS][NTORDIVS],
++ const Real F_TorConRange[MAX_TORS][MAX_TOR_CON][2],
++ const int N_con[MAX_TORS])
+
+ {
+ char graph[NROWS][LINE_LEN];
+Index: autodocksuite-4.2.3/autodock/prTorConList.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/prTorConList.h 2010-08-02 22:32:56.000000000 +0200
++++ autodocksuite-4.2.3/autodock/prTorConList.h 2010-08-02 22:33:39.000000000 +0200
+@@ -28,9 +28,9 @@
+ #define PRTORCONLIST
+ #include "constants.h"
+
+-void prTorConList( int ntor,
+- Boole B_isTorConstrained[MAX_TORS],
+- unsigned short US_torProfile[MAX_TORS][NTORDIVS],
+- Real F_TorConRange[MAX_TORS][MAX_TOR_CON][2],
+- int N_con[MAX_TORS]);
++void prTorConList( const int ntor,
++ const Boole B_isTorConstrained[MAX_TORS],
++ const unsigned short US_torProfile[MAX_TORS][NTORDIVS],
++ const Real F_TorConRange[MAX_TORS][MAX_TOR_CON][2],
++ const int N_con[MAX_TORS]);
+ #endif
+Index: autodocksuite-4.2.3/autodock/print_rem.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/print_rem.h 2010-08-02 22:34:14.000000000 +0200
++++ autodocksuite-4.2.3/autodock/print_rem.h 2010-08-02 22:35:25.000000000 +0200
+@@ -29,9 +29,9 @@
+
+ #include "typedefs.h"
+
+-void print_rem( FILE *outFile,
+- int Rank,
+- int NumMem,
+- int Run,
+- Real ref_rms);
++void print_rem( FILE *const outFile,
++ const int Rank,
++ const int NumMem,
++ const int Run,
++ const Real ref_rms);
+ #endif
+Index: autodocksuite-4.2.3/autodock/printdate.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/printdate.h 2010-08-02 22:36:23.000000000 +0200
++++ autodocksuite-4.2.3/autodock/printdate.h 2010-08-02 22:36:36.000000000 +0200
+@@ -29,5 +29,5 @@
+
+ #include "autocomm.h"
+
+-void printdate( FILE *fp, int flag );
++void printdate( FILE *const fp, const int flag );
+ #endif
+Index: autodocksuite-4.2.3/autodock/printhms.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/printhms.cc 2010-08-02 22:35:33.000000000 +0200
++++ autodocksuite-4.2.3/autodock/printhms.cc 2010-08-02 22:35:47.000000000 +0200
+@@ -33,7 +33,7 @@
+
+ extern FILE *logFile;
+
+-void printhms( Real t )
++void printhms( const Real t )
+
+ {
+ int h,
+Index: autodocksuite-4.2.3/autodock/printhms.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/printhms.h 2010-08-02 22:35:33.000000000 +0200
++++ autodocksuite-4.2.3/autodock/printhms.h 2010-08-02 22:35:52.000000000 +0200
+@@ -27,5 +27,5 @@
+ #ifndef PRINTHMS
+ #define PRINTHMS
+ #include "typedefs.h"
+-void printhms( Real t );
++void printhms( const Real t );
+ #endif
+Index: autodocksuite-4.2.3/autodock/qmultiply.cc
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/qmultiply.cc 2010-08-02 22:43:43.000000000 +0200
++++ autodocksuite-4.2.3/autodock/qmultiply.cc 2010-08-02 22:51:54.000000000 +0200
+@@ -37,9 +37,9 @@
+ extern FILE *logFile;
+
+
+-void qmultiply( Quat *q, //result
+- register const Quat *ql, //left
+- register const Quat *qr ) //right
++void qmultiply( Quat *const q, //result
++ register const Quat *const ql, //left
++ register const Quat *const qr ) //right
+
+ /******************************************************************************/
+ /* Name: qmultiply */
+@@ -76,9 +76,9 @@
+ q->w = w;
+ }
+
+-void qconjmultiply( Quat *q,
+- register const Quat *ql,
+- register const Quat *qr )
++void qconjmultiply( Quat *const q,
++ register const Quat *const ql,
++ register const Quat *const qr )
+ // __
+ // q = ql . qr
+ {
+@@ -86,7 +86,7 @@
+ qmultiply( q, &conj_ql, qr );
+ }
+
+-void mkUnitQuat( Quat *q )
++void mkUnitQuat( Quat *const q )
+ // essentially, convertRotToQuat( Quat q )
+ {
+ const double inv_nmag = 1. / hypotenuse( q->nx, q->ny, q->nz );
+@@ -137,7 +137,7 @@
+ printQuat( fp, q );
+ }
+
+-Quat normQuat( Quat q )
++Quat normQuat( /* not const */ Quat q )
+ // Normalise the 4D quaternion, x,y,z,w
+ {
+ register double mag4 = hypotenuse4( q.x, q.y, q.z, q.w );
+@@ -165,7 +165,7 @@
+ #define assertQuatOK( q ) {register double aQOK_mag4 = hypotenuse4( (q).x, (q).y, (q).z, (q).w ); assert((aQOK_mag4 > ONE_MINUS_EPSILON) && (aQOK_mag4 < ONE_PLUS_EPSILON)); }
+ */
+
+-Quat normRot( Quat q )
++Quat normRot( /* not const */ Quat q )
+ // Normalise the 3D rotation axis or vector nx,ny,nz
+ {
+ const double mag3 = hypotenuse( q.nx, q.ny, q.nz );
+@@ -193,7 +193,7 @@
+
+
+ //FIXME: this routine does not need to change argument q, but it does
+-Quat convertQuatToRot( Quat q )
++Quat convertQuatToRot( /* not const */ Quat q )
+ // Convert the quaternion components (x,y,z,w) of the quaternion q,
+ // to the corresponding rotation-about-axis components (nx,ny,nz,ang)
+ {
+@@ -307,7 +307,7 @@
+ return q;
+ }
+
+-void unitQuat2rotation( Quat *const q )
++void unitQuat2rotation( /* not const */ Quat *const q )
+ // Convert from a unit quaternion to a rotation about an unit 3D-vector
+ {
+ double inv_sin_half_ang;
+@@ -337,7 +337,7 @@
+ return;
+ } // Print message about q_reorient
+
+-void create_random_orientation( Quat *const ptr_quat )
++void create_random_orientation( /* not const */ Quat *const ptr_quat )
+ {
+ // Generate a random initial orientation for the ligand
+ // Generate a uniformly-distributed quaternion:
+@@ -591,7 +591,7 @@
+ return a;
+ }
+
+-Real alerp( Real a, Real b, const Real fract )
++Real alerp( /* not const */ Real a, /* not const */ Real b, const Real fract )
+ {
+ // if fract==0, return a
+ // if fract==1, return b
+Index: autodocksuite-4.2.3/autodock/qmultiply.h
+===================================================================
+--- autodocksuite-4.2.3.orig/autodock/qmultiply.h 2010-08-02 22:43:43.000000000 +0200
++++ autodocksuite-4.2.3/autodock/qmultiply.h 2010-08-02 22:54:00.000000000 +0200
+@@ -35,8 +35,8 @@
+ Quat convertQuatToRot( /* not const */ Quat q );
+ Quat convertRotToQuat( const Quat q );
+ Quat raaToQuat( const Real raa[3], Real angle );
+-Quat normQuat( Quat q );
+-Quat normRot( Quat q );
++Quat normQuat( /* not const */ Quat q );
++Quat normRot( /* not const */ Quat q );
+ Real quatDifferenceToAngle( const Quat ql, const Quat qr );
+ Real quatDifferenceToAngleDeg( const Quat ql, const Quat qr );
+ Quat conjugate( const Quat q );
+@@ -48,19 +48,19 @@
+ Quat axisDegreeToQuat( const Real ax, const Real ay, const Real az, const Real angle );
+ Quat quatComponentsToQuat( const Real qx, const Real qy, const Real qz, const Real qw );
+
+-void qmultiply( Quat *q, register const Quat *ql, register const Quat *qr );
+-void qconjmultiply( Quat *q, register const Quat *ql, register const Quat *qr );
+-void mkUnitQuat( Quat *q );
++void qmultiply( Quat *const q, register const Quat *const ql, register const Quat *const qr );
++void qconjmultiply( Quat *const q, register const Quat *const ql, register const Quat *const qr );
++void mkUnitQuat( Quat *const q );
+ void printQuat_q( FILE *const fp, const Quat q );
+ void printQuat_r( FILE *const fp, const Quat q );
+ void printQuat( FILE *const fp, const Quat q );
+ void debugQuat( FILE *const fp, const Quat q, const unsigned int linenumber, const char *message );
+ Quat uniformQuatByAmount( const Real amount );
+-void unitQuat2rotation( Quat *const q );
++void unitQuat2rotation( /* not const */ Quat *const q );
+ void print_q_reorient_message( FILE *const logFile, const Quat q_reorient );
+-void create_random_orientation( Quat *const ptr_quat );
++void create_random_orientation( /* not const */ Quat *const ptr_quat );
+ //void assertQuatOK( const Quat q );
+ const Quat identityQuat();
+-Real a_range_reduction( const Real a );
+-Real alerp( const Real a, const Real b, const Real fract );
++Real a_range_reduction( /* not const */ Real a );
++Real alerp( /* not const */ Real a, /* not const */ Real b, const Real fract );
+ #endif
Modified: trunk/packages/autodocksuite/trunk/debian/patches/series
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/series 2010-08-02 13:53:14 UTC (rev 5096)
+++ trunk/packages/autodocksuite/trunk/debian/patches/series 2010-08-02 21:03:02 UTC (rev 5097)
@@ -10,3 +10,4 @@
const_manual_35.patch
const_manual_50.patch
const_manual_55.patch
+const_manual_60.patch
More information about the debian-med-commit
mailing list