Ignore:
Timestamp:
Jun 22, 2015, 1:40:41 PM (9 years ago)
Author:
ldelgass
Message:

merge r5730 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5730

  • branches/1.4/src/core/RpBuffer.h

    r5674 r5731  
    2525};
    2626
    27 
    2827#ifdef __cplusplus
    29     extern "C" {
     28extern "C" {
    3029#endif // ifdef __cplusplus
    3130
    … …  
    4443 */
    4544
    46 class Buffer : public SimpleCharBuffer{
     45class Buffer : public SimpleCharBuffer {
    4746public:
    4847    Buffer();
    … …  
    7473
    7574    bool do_compress(Outcome& status, SimpleCharBuffer& bin,
    76                      SimpleCharBuffer& bout  );
    77     bool do_decompress( Outcome& status, SimpleCharBuffer& bin,
    78                         SimpleCharBuffer& bout  );
     75                     SimpleCharBuffer& bout);
     76    bool do_decompress(Outcome& status, SimpleCharBuffer& bin,
     77                       SimpleCharBuffer& bout);
    7978    bool do_base64_enc(Outcome& status, const SimpleCharBuffer& bin,
    80                        SimpleCharBuffer& bout  );
     79                       SimpleCharBuffer& bout);
    8180    bool do_base64_dec(Outcome& status, const SimpleCharBuffer& bin,
    82                        SimpleCharBuffer& bout  );
     81                       SimpleCharBuffer& bout);
    8382};
    8483
    … …  
    8685
    8786#ifdef __cplusplus
    88     }
     87}
    8988#endif // ifdef __cplusplus
    9089
Note: See TracChangeset for help on using the changeset viewer.