Changeset 19360


Ignore:
Timestamp:
Apr 10, 2010 6:41:26 AM (6 years ago)
Author:
pvachon
Message:

Small namespace issue cleanups

Location:
sandbox/warmerdam/pcidsk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sandbox/warmerdam/pcidsk/src/core/pcidskexception.cpp

    r17814 r19360  
    8181
    8282{
    83     va_list args;
     83    std::va_list args;
    8484
    8585    va_start( args, fmt );
     
    116116
    117117
    118 void PCIDSKException::vPrintf( const char *fmt, va_list args )
     118void PCIDSKException::vPrintf( const char *fmt, std::va_list args )
    119119
    120120{
     
    210210
    211211{
    212     va_list args;
     212    std::va_list args;
    213213    PCIDSKException ex("");
    214214
  • sandbox/warmerdam/pcidsk/src/pcidsk_exception.h

    r18472 r19360  
    4747        virtual ~PCIDSKException() throw();
    4848
    49         void vPrintf( const char *fmt, va_list list );
     49        void vPrintf( const char *fmt, std::va_list list );
    5050        virtual const char *what() const throw() { return message.c_str(); }
    5151    private:
  • sandbox/warmerdam/pcidsk/src/segment/cpcidskapmodel.cpp

    r19161 r19360  
    336336    /* -------------------------------------------------------------------- */
    337337
    338         if (!strncmp(&buf.buffer[22],"DS",2))
     338        if (!std::strncmp(&buf.buffer[22],"DS",2))
    339339            downsample = buf.GetInt(22, 3);
    340340
     
    464464        buf.Get(512 * 4, 16, map_units);
    465465   
    466         if (!strncmp(buf.Get(512 * 4 + 16, 3), "UTM", 3))
     466        if (!std::strncmp(buf.Get(512 * 4 + 16, 3), "UTM", 3))
    467467        {
    468468            buf.Get(512 * 4, 3, utm_units);
  • sandbox/warmerdam/pcidsk/src/segment/metadatasegment_p.cpp

    r18554 r19360  
    113113    int  prefix_len;
    114114
    115     sprintf( key_prefix, "METADATA_%s_%d_", group, id );
    116     prefix_len = strlen(key_prefix);
     115    std::sprintf( key_prefix, "METADATA_%s_%d_", group, id );
     116    prefix_len = std::strlen(key_prefix);
    117117
    118118/* -------------------------------------------------------------------- */
     
    143143/*      If this matches our prefix, capture the key and value.          */
    144144/* -------------------------------------------------------------------- */
    145         if( i_split != -1 && strncmp(pszNext,key_prefix,prefix_len) == 0 )
     145        if( i_split != -1 && std::strncmp(pszNext,key_prefix,prefix_len) == 0 )
    146146        {
    147147            std::string key, value;
     
    178178    char key_prefix[200];
    179179
    180     sprintf( key_prefix, "METADATA_%s_%d_", group, id );
     180    std::sprintf( key_prefix, "METADATA_%s_%d_", group, id );
    181181
    182182    std::string full_key;
     
    278278
    279279    seg_data.SetSize( new_data.size() );
    280     memcpy( seg_data.buffer, new_data.c_str(), new_data.size() );
     280    std::memcpy( seg_data.buffer, new_data.c_str(), new_data.size() );
    281281
    282282    WriteToFile( seg_data.buffer, 0, seg_data.buffer_size );
Note: See TracChangeset for help on using the changeset viewer.