Browse code

Merge branch 'master' into devel

* master:
bump version
Renive register keyword, which is deprecated in C++11

From: Laurent <lg390@cam.ac.uk>

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@122105 bc3139a8-67e5-0310-9ffc-ced21a209358

Laurent Gatto authored on 09/10/2016 10:21:36
Showing 3 changed files

... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.7.11
5
+Version: 2.7.12
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou
7 7
 Maintainer: Bernd Fischer <b.fischer@dkfz.de>,
8 8
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -1,3 +1,7 @@
1
+CHANGES IN VERSION 2.7.12
2
+-------------------------
3
+ o Fixing last warning on MacOS
4
+ 
1 5
 CHANGES IN VERSION 2.7.11
2 6
 -------------------------
3 7
  o Fix failing example and test due to updated msdata::protemics data
... ...
@@ -36,15 +36,15 @@ namespace boost{ namespace re_detail{
36 36
 
37 37
 void BOOST_REGEX_CALL raw_storage::resize(size_type n)
38 38
 {
39
-   register size_type newsize = start ? last - start : 1024;
39
+   size_type newsize = start ? last - start : 1024;
40 40
    while(newsize < n)
41 41
       newsize *= 2;
42
-   register size_type datasize = end - start;
42
+   size_type datasize = end - start;
43 43
    // extend newsize to WORD/DWORD boundary:
44 44
    newsize = (newsize + padding_mask) & ~(padding_mask);
45 45
 
46 46
    // allocate and copy data:
47
-   register pointer ptr = static_cast<pointer>(::operator new(newsize));
47
+   pointer ptr = static_cast<pointer>(::operator new(newsize));
48 48
    BOOST_REGEX_NOEH_ASSERT(ptr)
49 49
    if(start)
50 50
       std::memcpy(ptr, start, datasize);
... ...
@@ -63,7 +63,7 @@ void* BOOST_REGEX_CALL raw_storage::insert(size_type pos, size_type n)
63 63
    BOOST_ASSERT(pos <= size_type(end - start));
64 64
    if(size_type(last - end) < n)
65 65
       resize(n + (end - start));
66
-   register void* result = start + pos;
66
+   void* result = start + pos;
67 67
    std::memmove(start + pos + n, start + pos, (end - start) - pos);
68 68
    end += n;
69 69
    return result;