diff --git a/.gitignore b/.gitignore index cff00806..5d0fb1bb 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ ltmain.sh missing depcomp alliance/src/configure.in +alliance/src/ltmain.sh dev/scripts/cppcheck/* *.eps *.aux @@ -20,4 +21,5 @@ dev/scripts/cppcheck/* *.log *.lst archives/ - +cvsCommit.txt +gitCommit.txt diff --git a/alliance/src/mbkvhdlg/src/mvl_util.c b/alliance/src/mbkvhdlg/src/mvl_util.c index e44b57b5..cfb7a504 100644 --- a/alliance/src/mbkvhdlg/src/mvl_util.c +++ b/alliance/src/mbkvhdlg/src/mvl_util.c @@ -41,7 +41,7 @@ char *ctx_str; struct dct_recrd *recrd_pnt; struct dct_recrd *last_recrd = NULL; - index = (long)key_str % MVL_HSZDFN; + index = (unsigned long)key_str % MVL_HSZDFN; entry_pnt = head [index]; while (entry_pnt != NULL) @@ -204,7 +204,7 @@ long valu; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; - index = (long) key_str % MVL_HSZDFN; + index = (unsigned long) key_str % MVL_HSZDFN; entry_pnt = head[index]; while (entry_pnt != NULL) @@ -287,7 +287,7 @@ long field; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; - entry_pnt = head [(long)key_str % MVL_HSZDFN]; + entry_pnt = head [(unsigned long)key_str % MVL_HSZDFN]; while (entry_pnt != NULL) { diff --git a/alliance/src/ocp/src/common/Makefile.am b/alliance/src/ocp/src/common/Makefile.am index 653a6ea6..b947453e 100644 --- a/alliance/src/ocp/src/common/Makefile.am +++ b/alliance/src/ocp/src/common/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CXXFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src -std=c++0x +AM_CXXFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src -std=gnu++0x noinst_LIBRARIES = libPCommon.a diff --git a/alliance/src/ocp/src/placer/Makefile.am b/alliance/src/ocp/src/placer/Makefile.am index 322b2c47..d6f9bc1c 100644 --- a/alliance/src/ocp/src/placer/Makefile.am +++ b/alliance/src/ocp/src/placer/Makefile.am @@ -4,7 +4,7 @@ YACC = @YACC@ -d INCLUDES = -I$(srcdir)/../common -AM_CXXFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src -std=c++0x +AM_CXXFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src -std=gnu++0x AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src bin_PROGRAMS = ocp diff --git a/alliance/src/ppt/src/Makefile.am b/alliance/src/ppt/src/Makefile.am index b4cca0d1..bd14e4f8 100644 --- a/alliance/src/ppt/src/Makefile.am +++ b/alliance/src/ppt/src/Makefile.am @@ -19,11 +19,12 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y $(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \ && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \ | sed -e "s/int[ ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \ - | sed -e "s/PAT_DECL_Y_STYPE[ ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \ | sed -e "s/int[ ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \ > pat_decl_y.c \ && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h +# | sed -e "s/PAT_DECL_Y_STYPE[ ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" + pat_decl_l.c : $(srcdir)/pat_decl_l.l pat_decl_y.h $(LEX) -t $(srcdir)/pat_decl_l.l | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_decl_l.c