[Libreoffice-commits] core.git: sal/osl

Tor Lillqvist tml at collabora.com
Mon Oct 5 02:02:12 PDT 2015


 sal/osl/w32/profile.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c61cf21e0acb41e9b8268d80ebd16cf616a4636c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 5 11:45:03 2015 +0300

    Fix error C2440: casts required
    
    Change-Id: I34f7e43d7ed4daaf39f7453114ee468e27f0d90e

diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index ca96496..b3ef175 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1385,7 +1385,7 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line)
         if (pProfile->m_Lines == NULL)
         {
             pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
+            pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
         }
         else
         {
@@ -1426,7 +1426,7 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li
         if (pProfile->m_Lines == NULL)
         {
             pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
+            pProfile->m_Lines = (sal_Char **)calloc(pProfile->m_MaxLines, sizeof(sal_Char *));
         }
         else
         {
@@ -1597,7 +1597,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char*
         if (pProfile->m_Sections == NULL)
         {
             pProfile->m_MaxSections = SECTIONS_INI;
-            pProfile->m_Sections = calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection));
+            pProfile->m_Sections = (osl_TProfileSection *)calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection));
         }
         else
         {


More information about the Libreoffice-commits mailing list