Changeset 3e44184


Ignore:
Timestamp:
Mar 20, 2017 6:09:24 PM (6 months ago)
Author:
www-data <www-data@…>
Branches:
master, feature_CIS, release_9.4, release_9.5
Children:
d05aea0
Parents:
97906d8
git-author:
Brennan Bell <b.bell@…> (03/20/17 16:50:14)
git-committer:
www-data <www-data@…> (03/20/17 18:09:24)
Message:

ticket:1511 made a small change in the hdf files and added an include to ensure clean compiles with make and make -j

Summary: see subject

Test Plan: compile with strict mode

Reviewers: dmisev

Differential Revision: http://codereview.rasdaman.org/D361

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • conversion/hdf.cc

    r91ca341 r3e44184  
    201201    SDsetcompress(sds_id, comp_type, &c_info);
    202202
    203     SDwritedata(sds_id, start, NULL, dimsizes, (VOIDP)(desc.src));
     203    SDwritedata(sds_id, start, NULL, dimsizes, const_cast<char*>(desc.src));
    204204
    205205    delete [] dimsizes;
     
    286286    }
    287287    filesize = desc.srcInterv[0].high() - desc.srcInterv[0].low() + 1;
    288     if ((i = fwrite(desc.src, 1, filesize, fp)) != filesize)
     288    size_t j = 0;
     289    if ((j = fwrite(desc.src, 1, filesize, fp)) != filesize)
    289290    {
    290291        LFATAL << "r_Conv_HDF::convertFrom(): error writing to temporary file ("
    291                << i << " / " << filesize << ')';
     292               << j << " / " << filesize << ')';
    292293        throw r_Error(r_Error::r_Error_General);
    293294    }
     
    338339    }
    339340
    340     if (SDreaddata(sds_id, start, NULL, dimsizes, (VOIDP)desc.dest) == FAIL)
     341    if (SDreaddata(sds_id, start, NULL, dimsizes, static_cast<void*>(desc.dest)) == FAIL)
    341342    {
    342343        LFATAL << "r_Conv_HDF::convertFrom(): error reading data";
  • rascontrol_x/src/CMakeLists.txt

    r57107c1 r3e44184  
    2828
    2929    if (READLINE_FOUND)
    30         add_definitions(-D READLINELIB=1)
     30        add_definitions(-DREADLINELIB=1)
    3131        set(REQUIRED_LIBRARIES ${READLINE_LIBRARIES})
    3232    endif (READLINE_FOUND)
  • third_party/grpc-java/CMakeLists.txt

    re3cc94b r3e44184  
    4141            ${GRPC_JAVA_SOURCE_DIR}/java_generator.h
    4242            ${GRPC_JAVA_SOURCE_DIR}/java_plugin.cpp)
    43     add_dependencies(${GRPC_JAVA_PLUGIN_EXECUTABLE} google-protobuf)
     43    add_dependencies(${GRPC_JAVA_PLUGIN_EXECUTABLE} google-grpc google-protobuf)
    4444    include_directories(${PROTOBUF_INCLUDE_DIR})
    4545    target_link_libraries(${GRPC_JAVA_PLUGIN_EXECUTABLE}
Note: See TracChangeset for help on using the changeset viewer.