Changeset 1130 for cpp/frams/util


Ignore:
Timestamp:
04/16/21 15:55:34 (4 years ago)
Author:
Maciej Komosinski
Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

Location:
cpp/frams/util
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/util/extvalue.h

    r851 r1130  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    88#include "sstring.h"
    99#include <frams/param/param.h>
    10 #include <common/nonstd_stl.h>
    1110#include <common/threads.h>
     11#include <vector>
    1212
    1313#define EXTVALUEUNION

  • cpp/frams/util/multirange.cpp

    r733 r1130  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    55#include "multirange.h"
    6 #include <common/nonstd_stl.h>
     6#include <algorithm>
    77
    88#include <stdio.h>
    … …  
    230230                break;
    231231        case SAME + JOINBEGIN: // extend 1 range
    232                 setEnd(r1, max(getEnd(r2), end));
     232                setEnd(r1, std::max(getEnd(r2), end));
    233233                break;
    234234        case SAME + JOINEND: // extend 1 range
    … …  
    244244                break;
    245245        case JOINBEGIN: // extend r1
    246                 setEnd(r1, max(end, getEnd(r2)));
     246                setEnd(r1, std::max(end, getEnd(r2)));
    247247                removeRanges(r1 + 1, r2);
    248248                break;
    … …  
    253253        case 0: // extend r2
    254254                setBegin(r2, begin);
    255                 setEnd(r2, max(end, getEnd(r2)));
     255                setEnd(r2, std::max(end, getEnd(r2)));
    256256                removeRanges(r1 + 1, r2 - 1);
    257257                break;

  • cpp/frams/util/sstring-simple.cpp

    r1040 r1130  
    11#include "sstring.h"
    2 #include <common/nonstd_stl.h>
    32#include "extvalue.h"
    43#include <assert.h>

  • cpp/frams/util/sstring.cpp

    r1040 r1130  
    2020// - mutex required to be thread safe
    2121
    22 #include <common/nonstd_stl.h>
    2322#include "extvalue.h"
    2423#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.