From ab51fda962f7f2a9bdb700367e595318a6c47edc Mon Sep 17 00:00:00 2001
From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch>
Date: Mon, 10 Dec 2007 21:30:33 +0000
Subject: [PATCH] fix a warning in stressMathore and a problem making
 dictionary library on Windows

git-svn-id: http://root.cern.ch/svn/root/trunk@21313 27541ba8-7e3a-0410-8455-c3a389f83636
---
 test/Makefile           | 81 +++--------------------------------------
 test/stressMathMore.cxx |  2 +-
 2 files changed, 7 insertions(+), 76 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 211f41db853..0aa639dda6d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -73,10 +73,10 @@ STRESSVECO   = stressVector.$(ObjSuf)
 STRESSVECS   = stressVector.$(SrcSuf)
 STRESSVEC    = stressVector$(ExeSuf)
 
+STRESSMATHO   = stressMathCore.$(ObjSuf) 
+STRESSMATHS   = stressMathCore.$(SrcSuf) 
 ifneq ($(USE_REFLEX),)
 CXXFLAGS += -DUSE_REFLEX
-STRESSMATHO   = stressMathCore.$(ObjSuf)  TrackMathCoreRflx.$(ObjSuf) 
-STRESSMATHS   = stressMathCore.$(SrcSuf)  TrackMathCoreRflx.$(SrcSuf)
 ifeq ($(PLATFORM),win32)
 STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib' '$(ROOTSYS)/lib/libReflex.lib' '$(ROOTSYS)/lib/libCintex.lib' 
 else
@@ -88,8 +88,6 @@ TRACKMATHLIB = libTrackMathcoreRflx.$(DllSuf)
 
 
 else 
-STRESSMATHO   = stressMathCore.$(ObjSuf) 
-STRESSMATHS   = stressMathCore.$(SrcSuf) 
 
 ifeq ($(PLATFORM),win32)
 STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib'
@@ -351,75 +349,8 @@ endif
 		@echo "$@ done"
 
 
-#ifneq ($(useReflex),)
-
 
 
-libTrackMathCoreRflx.$(DllSuf): 	TrackMathCoreRflx.$(ObjSuf) 
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
-ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
-ifeq ($(PLATFORM),macosx)
-# We need to make both the .dylib and the .so
-		$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-ifeq ($(MACOSX_MINOR),4)
-		ln -sf $@ $(subst .$(DllSuf),.so,$@)
-else
-		$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
-		   $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
-endif
-else
-ifeq ($(PLATFORM),win32)
-		bindexplib $* $^ > $*.def
-		lib -nologo -MACHINE:IX86 $^ -def:$*.def \
-		   $(OutPutOpt)$(EVENTLIB)
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) \
-		   $(OutPutOpt)$@
-		$(MT_DLL)
-else
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
-endif
-endif
-endif
-endif
-		@echo "$@ done"
-
-#endif
-
-libTrackMathCoreCint.$(DllSuf): 	TrackMathCoreCint.$(ObjSuf) 
-ifeq ($(ARCH),aix)
-		/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
-ifeq ($(ARCH),aix5)
-		/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
-ifeq ($(PLATFORM),macosx)
-# We need to make both the .dylib and the .so
-		$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-ifeq ($(MACOSX_MINOR),4)
-		ln -sf $@ $(subst .$(DllSuf),.so,$@)
-else
-		$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
-		   $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
-endif
-else
-ifeq ($(PLATFORM),win32)
-		bindexplib $* $^ > $*.def
-		lib -nologo -MACHINE:IX86 $^ -def:$*.def \
-		   $(OutPutOpt)$(EVENTLIB)
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) \
-		   $(OutPutOpt)$@
-		$(MT_DLL)
-else
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
-endif
-endif
-endif
-endif
-		@echo "$@ done"
 
 
 $(TRACKMATHLIB):	$(TRACKMATHOBJ)
@@ -439,19 +370,19 @@ else
 		   $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
 endif
 else
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(EXPLLINKLIBS) $(OutPutOpt)$@
+		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(EXPLLINKLIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
 		$(MT_DLL)
+#endif
 endif
 endif
 endif
 
-
 $(STRESSMATH):   $(STRESSMATHO) $(TRACKMATHLIB)
 ifeq ($(PLATFORM),win32)
-		$(LD) $(LDFLAGS) $^ $(LIBS) $(STRESSMATHLIBS)  $(OutPutOpt)$@
+		$(LD) $(LDFLAGS) $(STRESSMATHO) $(LIBS) $(STRESSMATHLIBS)  $(OutPutOpt)$@
 		$(MT_EXE)
 else
-		$(LD) $(LDFLAGS) $^ $(LIBS) $(STRESSMATHLIBS)  $(OutPutOpt)$@
+		$(LD) $(LDFLAGS) $(STRESSMATHO) $(LIBS) $(STRESSMATHLIBS)  $(OutPutOpt)$@
 endif
 		@echo "$@ done"
 
diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx
index f3bcb89e2f9..00fd784d530 100644
--- a/test/stressMathMore.cxx
+++ b/test/stressMathMore.cxx
@@ -542,7 +542,7 @@ int stressMathMore(double nscale = 1) {
    TBenchmark bm;
    bm.Start("stressMathMore");
    
-   int n = nscale*100;
+   int n = int(nscale*100);
 
    iret |= testGammaFunction(n);
    iret |= testBetaFunction(n);
-- 
GitLab