$RBGB/cvsdiffbde051211.txt
date: 051211:1501
pwd: $RBGB
saturn.cs.uml.edu(35)> cvsdiff . |& wc
       400      1433     12319
----------------------------------------------
5:diff -b -i -t -w -r1.33 Imakefile
13:diff -b -i -t -w -r1.6 dprint.h
20:diff -b -i -t -w -r1.6 prep.csh
29:diff -b -i -t -w -r1.14 graph.h
66:diff -b -i -t -w -r1.8 prototype.h
81:diff -b -i -t -w -r1.1.1.1 bde.defaults
98:diff -b -i -t -w -r1.1 94sbde_schema.h
115:diff -b -i -t -w -r1.1 pr_log.c
202:diff -b -i -t -w -r1.2 94sbde_schema.h
235:diff -b -i -t -w -r1.1 pr_load.c
323:diff -b -i -t -w -r1.18 Imakefile
345:diff -b -i -t -w -r1.6 captionops.cc
357:diff -b -i -t -w -r1.5 initClasses.cc
370:diff -b -i -t -w -r1.15 textops.cc
6:diff -b -i -t -w -r1.33 Imakefile
14:diff -b -i -t -w -r1.6 dprint.h
21:diff -b -i -t -w -r1.6 prep.csh
36:diff -b -i -t -w -r1.14 graph.h
73:diff -b -i -t -w -r1.8 prototype.h
89:diff -b -i -t -w -r1.1.1.1 bde.defaults
107:diff -b -i -t -w -r1.1 94sbde_schema.h
124:diff -b -i -t -w -r1.1 pr_log.c
217:diff -b -i -t -w -r1.2 94sbde_schema.h
250:diff -b -i -t -w -r1.1 pr_load.c
345:diff -b -i -t -w -r1.18 Imakefile
367:diff -b -i -t -w -r1.6 captionops.cc
379:diff -b -i -t -w -r1.5 initClasses.cc
392:diff -b -i -t -w -r1.15 textops.cc
cvs diff: Diffing .
Index: Imakefile
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/Imakefile,v
retrieving revision 1.33
diff -b -i -t -w -r1.33 Imakefile
306a307,308
> /* -p ==> profile data for prof; -pg ==> profile data for gprof.*/
> 
Index: dprint.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/dprint.h,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 dprint.h
66d65
< //#define EP #ifdef DPDBUG CEP  #endif -  fails to insert \n or \\ before #endif
Index: prep.csh
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/prep.csh,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 prep.csh
33c33
< alias G 'gdb -x cmd.041024 ../pr_util_nolog/$HOSTTYPE/bin/bde.exe'
---
> alias G 'gdb -x cmds051210 ../pr_util_nolog/$HOSTTYPE/bin/bde.exe'
cvs diff: Diffing doc
cvs diff: Diffing doc/idraw
cvs diff: Diffing executables
cvs diff: Diffing executables/alpha
cvs diff: Diffing executables/i386-linux
cvs diff: Diffing include
Index: include/graph.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/include/graph.h,v
retrieving revision 1.14
diff -b -i -t -w -r1.14 graph.h
198c198,199
<  * added  below 2k0715 (see init.cc - RJL) */
---
>  * Brackets were added  below 2k0715 (see init.cc - RJL)
>  */
517c518
<         hlink(struct HL *passHL);
---
>         hlink(struct HL *passHL);       // c'tor
583d583
< 
664a665,667
> 
>         void PrintGraphObjectList(void); //RJL051127 for debug
> 
689,691c692,695
<         void doDraw();                  /* added or restored? - RJL041219 */
<         void doDump();
<         void doprint();
---
>         void doDraw(void);                      /* added or restored? - RJL041219 */
>         void doDump(void);
>         void doprint(void);             // in fprint.cc
>         void doPrint(void);     // debug aid in graphobject.cc - added 051126 - RJL
699c703
< 
---
>         void PrintGraphObjectList (void);
702c706
< extern Ggroup *object, *topobject;
---
> extern Ggroup *object, *topobject; /* initialized ( = new Ggroup) in init.cc */
Index: include/prototype.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/include/prototype.h,v
retrieving revision 1.8
diff -b -i -t -w -r1.8 prototype.h
264,265c264,265
< extern void doexit();
< extern void dosave();
---
> extern void doexit(Widget, XtPointer, XmAnyCallbackStruct *);
> extern void dosave(_WidgetRec *, void *, XmAnyCallbackStruct *);
280c280
< extern void docancel();
---
> extern void docancel(Widget, XtPointer, XmAnyCallbackStruct *);
cvs diff: Diffing lib
Index: lib/bde.defaults
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/lib/bde.defaults,v
retrieving revision 1.1.1.1
diff -b -i -t -w -r1.1.1.1 bde.defaults
6,7c6,7
< bde.height: 700
< bde.width : 1000
---
> bde.height: 800
> bde.width : 700
15,16c15,16
< bde.form.scrollwindow.canvas.height: 800
< bde.form.scrollwindow.canvas.width: 900
---
> bde.form.scrollwindow.canvas.height: 650
> bde.form.scrollwindow.canvas.width: 600
cvs diff: Diffing pr_util_log
Index: pr_util_log/94sbde_schema.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/94sbde_schema.h,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 94sbde_schema.h
18c18
< #include "../dprint.h"
---
> #include "dprint.h"
27c27
< #define CHGEN_QUALIFIERS " -log"
---
> #define CHGEN_QUALIFIERS " -log -metafile"
292c292
< extern hcg_ptr pr_gen_create(size_t);
---
> /*extern hcg_ptr pr_gen_create(size_t); extern "C" at line 805-RJL051202 */
Index: pr_util_log/pr_log.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/pr_log.c,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 pr_log.c
15c15
< /* Log added 041129 - RJL  */
---
> /* Log aded 041129 - RJL  */
39a40
> /*   strcpy();*/
403c404
< #ifdef GENLOG
---
> 
418d418
< #endif
421c421,422
< #ifdef GENLOG
---
> 
> //#ifdef GENLOG
445c446
<             LP;return;
---
>             return;
451c452
< #endif
---
> //#endif
469c470
< {//EP; << caused pr_log.c:471: parse error before `char' - RJL050909
---
> {
475c476,477
< EP;//moved here from '{EP;' - RJL050909
---
> 
> EP;
481c483
<                 LP;return (-1);
---
>                 return (-1);
489c491
<                 LP;return (-2);
---
>                 return (-2);
503c505
<                 LP;return (-4);
---
>                 return (-4);
526c528
<                 LP;return (-3);
---
>                 return (-3);
548,549c550,551
<         LP;return (0);
< LP;}    /* End pr_startlog      */
---
>         return (0);
> }       /* End pr_startlog      */
1545c1547
< /* #if 0 at line 1591 to EOF */ 
---
> /* #if 0 at line 1559 to EOF */
2140,2141c2142,2143
< #ifdef GENLOG
< int pr_replay(char *view, char* logfile,
---
> 
> int pr_replay(char *view, char logfile[NAMELENGTH],
2144c2146
< 
---
>   /*unused: FILE *log_fp;*/
2210c2212
< //#ifdef GENLOG
---
> #ifdef GENLOG
2212c2214
< //#endif
---
> #endif
2234c2236
< #endif
---
> 
cvs diff: Diffing pr_util_log/alpha
cvs diff: Diffing pr_util_log/alpha/bin
cvs diff: Diffing pr_util_log/alpha/obj
cvs diff: Diffing pr_util_log/alpha/probj
cvs diff: Diffing pr_util_log/i386-linux
cvs diff: Diffing pr_util_nolog
Index: pr_util_nolog/94sbde_schema.h
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/94sbde_schema.h,v
retrieving revision 1.2
diff -b -i -t -w -r1.2 94sbde_schema.h
6c6
< /*****************************************************************/
---
> /***************************************************************/
18c18
< #include "../dprint.h"
---
> #include "dprint.h"
27c27
< #define CHGEN_QUALIFIERS ""
---
> #define CHGEN_QUALIFIERS " -metafile"
273,275c273,275
< /***********************************************/
< /* This structure is used to simplify type casting pointers within table */
< /* rows.                                                                 */
---
> /*line 273:**********************************************/
> /* This structure is used to simplify type casting pointers within table rows. */
> /*(I think it should be type hcg_key = unsigned int-RJL051126 ) */
292c292
< extern hcg_ptr pr_gen_create(size_t);
---
> /*extern hcg_ptr pr_gen_create(size_t); extern "C" at line 805-RJL051202 */
805c805
<     extern hcg_ptr pr_gen_create(size_t);
---
>     extern hcg_ptr pr_gen_create(size_t); /* vs.line 292? */
Index: pr_util_nolog/pr_load.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/pr_load.c,v
retrieving revision 1.1
diff -b -i -t -w -r1.1 pr_load.c
37c37
< /* includes dprint.h */
---
> /* includes dprint.h but not lut.h */
43a44
> extern int lut_init(lut_st, lut_type);/*in lut.c, not lut.h-RJL051127*/
737d737
< 
738a739
> 
751c752
< void pr_init ( char *viewdef_filename, char *filelist) /* l592-1922  */
---
> void pr_init ( char *viewdef_filename, char *filelist) /* 752-1065  */
766a768
> EP;
772c774,775
<     lut_init(&hcg_table_abbrev_lut, ABBR_TBL_TYPE);
---
> /*in lut.c, bbr_lut_create calls lut_init(p_lut, ABBR_TBL_TYPE); -RJL051127 */
> /*so I removed this call:   lut_init(&hcg_table_abbrev_lut, ABBR_TBL_TYPE);*/
884,885c887,889
<   dprintdd("hcg_row = %d, hcg_version = %d in ", 
<        hcg_row, hcg_version);DP; /* newline in DP */
---
>  /*dprintdd("hcg_row = %d, hcg_version = %d ", 
>                 hcg_row, hcg_version);DP; 
>  */
895c899
<           dprintdd("New maxver = %d from key %x\n", hcg_version, hcg_k);
---
>           //dprintdd("New maxver = %d from key %x\n", hcg_version, hcg_k);
898c902
<    } /* while (!feof(hcg_ascii_fp))*/
---
>       } /* end  while (!feof(hcg_ascii_fp))*/
1061c1065
< }/* end pr_init (1592:1922)*/
---
> LP;}/* end pr_init (log:1592:1922)(nolog:752-1065) */
1239c1243,1244
<         (struct pa *) ca##curr->p##_fpp = pa##curr2; \
---
>         /*(struct pa *) ca##curr->p##_fpp = pa##curr2;*/ \
>         ca##curr->p##_fpp = (struct dummy_type*) pa##curr2; \
1244,1245c1249,1252
<                 for (ca##temp2 = pa##curr2->c##_fcp; (struct pa *) ca##temp2->p##_fpp != pa##curr2; ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \
<                 (struct ca *) ca##temp2->p##_fpp = ca##curr; \
---
>         for (ca##temp2 = pa##curr2->c##_fcp; \
>                 (struct pa*) ca##temp2->p##_fpp != pa##curr2; \
>                 ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \
>             /*(struct ca *)*/ ca##temp2->p##_fpp = (struct dummy_type*) ca##curr; \
1418c1425,1426
< 
---
>         char* ttabbrev; /* added 051127 - wouldn't permit decl in asgnmt. */
> EP;
1445a1454,1459
>         /*tbl_encoding=encoding( hcg_table_seq_list[hcg_tbl_idx].ttabbrev);*/
>         ttabbrev =  hcg_table_seq_list[hcg_tbl_idx].ttabbrev;
>         DP; tbl_encoding = encoding(ttabbrev);
>         dprintds("tbl_encoding=%d,ttabbrev=\n", tbl_encoding, ttabbrev);
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
>         TTPRNT;
1447d1460
<         tbl_encoding = encoding( hcg_table_seq_list[hcg_tbl_idx].ttabbrev );    
1449c1462,1464
<         {
---
>         {// TBD: make these class methods when gencpp makes XX a class:
>          // E.g.: call class method FO::do_add(ifldvalist) for case#0.
>          // But pr_create must call a c'tor first, without a pkey???
1613,1614c1628
<              dprint("TBD: Load checkpoint *DB1 then replay logfile.
< ");
---
>              dprint("TBD: Load checkpoint *DB1 then replay logfile.\n");//was bug - RA051126
1724c1738,1739
< 
---
> #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n")
> TTPRNT;
cvs diff: Diffing pr_util_nolog/alpha
cvs diff: Diffing pr_util_nolog/alpha/bin
cvs diff: Diffing pr_util_nolog/alpha/obj
cvs diff: Diffing pr_util_nolog/alpha/probj
cvs diff: Diffing schema
cvs diff: Diffing schema/altSchemas
cvs diff: Diffing src
Index: src/Imakefile
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/Imakefile,v
retrieving revision 1.18
diff -b -i -t -w -r1.18 Imakefile
4,9d3
<  # * Revision 1.18  2005/12/10 03:40:53  lechner
<  # * Added -I$(TOP) to $INCLUDES  so dprint.h can be linked in.
<  # *
<  # * Revision 1.17  2005/11/11 23:29:42  lechner
<  # * Minor comment updates
<  # *
197,198c191,192
< ## * src/Imakefile:  $(OBJDIR)%.o : $(SRCDIR)%.cc 
< ## * these do not work on alpha hosts: */
---
> ## * src/Imakefile:  $(OBJDIR)%.o : $(SRCDIR)%.cc */
> ## * these do not work on alpha hosts:
201d194
< 
202a196
> ## .SUFFIXES: (gmake complains: no suffix list - venus 051111)
Index: src/captionops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/captionops.cc,v
retrieving revision 1.6
diff -b -i -t -w -r1.6 captionops.cc
195c195,196
< 
---
> //extern Ggroup* topobject; //in graph.h; = new in init.cc; 
> // for caption_create and caption_resize
258d258
<     
Index: src/initClasses.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/initClasses.cc,v
retrieving revision 1.5
diff -b -i -t -w -r1.5 initClasses.cc
272c272
< {
---
> {EP;
297c297
< } // end docanvasexposure
---
> LP;} // end docanvasexposure
Index: src/textops.cc
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/textops.cc,v
retrieving revision 1.15
diff -b -i -t -w -r1.15 textops.cc
1220c1220
<         // see analogous event->type map to eventname[type] in eventtypelist.h
---
>         // see analogous event->type map to eventname[type] in eventNameList.h
cvs diff: Diffing symtxt
cvs diff: Diffing test
cvs diff: cannot find test/hi.dat
cvs diff: Diffing tools