[GenABEL-dev] [Genabel-commits] r705 - pkg/ProbABEL/src

[L.C. Karssen]

Hi Yurii,

On Fri, 2011-04-01 at 10:03 +0200, Yurii Aulchenko wrote:
> Hi Lennart,
> 
> Defining the error() function in data.h of ProbABEL sounds like a
> great solution to the bug, thank you!
Thanks. But actually it is a quick and dirty solution. IIRC header files
should not contain actual function definitions, only forward
declarations. But since data.h is full of implementations anyway I
decided to add it there as well. 

> 
> Everything compiles well now; examples seem to run well :)
> 
> We still need to make distrib and put that on GenABEL-project
> web-site. Would you have time for this?
I will do that. Hopefully later today. 


> 
> Also, should we reflect the changes in CHANGES.LOG and update the
> version to 0.1-9e, say? Not sure it is really necessary, though.
Good point, the changelog should indeed be updated. I would indeed raise
the version number, this bug was a show-stopper since the package
wouldn't properly compile. So fixing it is important enough to warrant
a separate release (and therefore an increased version number).



Lennart.


> 
> Yurii
> 
> 
> On Fri, Apr 1, 2011 at 8:33 AM,  <noreply at r-forge.wu-wien.ac.at> wrote:
> > Author: lckarssen
> > Date: 2011-04-01 08:33:48 +0200 (Fri, 01 Apr 2011)
> > New Revision: 705
> >
> > Modified:
> >   pkg/ProbABEL/src/data.h
> > Log:
> > Fixes bug #1339:
> > Remove the inclusion of fvlib/frerror.h (this file had been removed in r599). The error() function is now defined in this file. The function definition was simply taken from fvlib/frerror.cpp (also deleted in r599).
> >
> > The changes further down the file is the removal of superfluous spaces (artifact of my emacs).
> >
> >
> > Modified: pkg/ProbABEL/src/data.h
> > ===================================================================
> > --- pkg/ProbABEL/src/data.h     2011-03-30 23:54:07 UTC (rev 704)
> > +++ pkg/ProbABEL/src/data.h     2011-04-01 06:33:48 UTC (rev 705)
> > @@ -1,6 +1,7 @@
> >  #include <string>
> >  #include <sstream>
> >  #include <fstream>
> > +#include <cstdarg>
> >  #include "mematrix.h"
> >
> >  #include "fvlib/AbstractMatrix.h"
> > @@ -8,7 +9,6 @@
> >  #include "fvlib/const.h"
> >  #include "fvlib/convert_util.h"
> >  #include "fvlib/FileVector.h"
> > -#include "fvlib/frerror.h"
> >  #include "fvlib/frutil.h"
> >  #include "fvlib/frversion.h"
> >  #include "fvlib/Logger.h"
> > @@ -16,6 +16,18 @@
> >
> >  extern bool is_interaction_excluded;
> >
> > +void error(const char * format, ...)
> > +{
> > +    va_list args;
> > +    char buffer[256];
> > +    va_start(args, format);
> > +    vsprintf(buffer, format, args);
> > +    va_end(args);
> > +
> > +    printf("ERROR: %s\n",buffer);
> > +    exit(EXIT_FAILURE);
> > +}
> > +
> >  unsigned int Nmeasured(char * fname, int nphenocols, int npeople)
> _______________________________________________
> genabel-devel mailing list
> genabel-devel at lists.r-forge.r-project.org
> https://lists.r-forge.r-project.org/cgi-bin/mailman/listinfo/genabel-devel

-- 
-----------------------------------------------
L.C. Karssen
Erasmus MC
Department of Epidemiology
Room Ee2224

Postbus 2040
3000 CA Rotterdam
The Netherlands

phone: +31-10-7044217
fax: +31-10-7044657
email: l.karssen at erasmusmc.nl
GPG key ID: 0E1D39E3
-----------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.r-forge.r-project.org/pipermail/genabel-devel/attachments/20110401/6d7034fa/attachment.pgp>