[Compbench-devel] CompBenchmarks++/Benchmark Benchmark.cpp, 1.14, 1.15 Benchmark.h, 1.9, 1.10

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31136

Modified Files:
	Benchmark.cpp Benchmark.h 
Log Message:
Download can be disabled.
Explicit message.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Benchmark.h	1 Nov 2006 12:59:56 -0000	1.9
--- Benchmark.h	23 Nov 2006 16:35:32 -0000	1.10
***************
*** 53,61 ****
    Status                             status;
  
-   /** URL used for downloading package.
-    *  \return std::string representing the URL of the package
-    *  \sa expectedMD5() */
-   virtual std::string downloadURL(void) = 0;
- 
    /** Expected MD5 on downloaded package
     *  \return MD5 expected, as an std::string */
--- 53,56 ----
***************
*** 250,253 ****
--- 245,254 ----
   public:
  
+   /** URL used for downloading package.
+    *  \return std::string representing the URL of the package
+    *  \sa expectedMD5() */
+   virtual std::string downloadURL(void) = 0;
+ 
+ 
    /** Display informations about benchmark
        Used by compbenchmark-config. Format is strict, default behaviour must be

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Benchmark.cpp	1 Nov 2006 12:59:56 -0000	1.14
--- Benchmark.cpp	23 Nov 2006 16:35:32 -0000	1.15
***************
*** 540,543 ****
--- 540,547 ----
    int r;
  
+   if (downloadURL()=="") {
+     UI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option.");
+   }
+ 
    resetContext();