[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

Denis Barbier bouzim at gmail.com
Fri Feb 24 18:50:11 UTC 2012


The following commit has been merged in the upstream branch:
commit e5af768419680639d585d1b119639b984ca4633c
Author: Fotios Sioutis <sfotis at gmail.com>
Date:   Fri Dec 16 12:15:21 2011 +0200

    atol of cstdlib must be changed to std::atol (bcc)
    
    since upstream changed "stdlib.h" to "cstdlib" now all functions
    declared inside standard library become members of std namespace.

diff --git a/src/OSD/OSD_MAllocHook.cxx b/src/OSD/OSD_MAllocHook.cxx
index ef41e0d..ed49e10 100644
--- a/src/OSD/OSD_MAllocHook.cxx
+++ b/src/OSD/OSD_MAllocHook.cxx
@@ -291,10 +291,10 @@ Standard_Boolean OSD_MAllocHook::LogFileHandler::MakeReport
     while (*pStr != ' ' && *pStr) pStr++;
     *pStr++ = '\0';
     while (*pStr == ' ' && *pStr) pStr++;
-    aReqNum = atol(pStr);
+    aReqNum = std::atol(pStr);
     while (*pStr != ' ' && *pStr) pStr++;
     while (*pStr == ' ' && *pStr) pStr++;
-    aSize = atol(pStr);
+    aSize = std::atol(pStr);
     Standard_Boolean isAlloc = Standard_False;
     if (strcmp(aType, "alloc") == 0)
     {

-- 
OCE packaging



More information about the debian-science-commits mailing list