Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/cpp/include/__bits/functional/bind.hpp

    r7f7817a9 rab936440  
    11/*
    2  * Copyright (c) 2018 Jaroslav Jindrak
     2 * Copyright (c) 2019 Jaroslav Jindrak
    33 * All rights reserved.
    44 *
     
    3333#include <__bits/functional/invoke.hpp>
    3434#include <__bits/functional/reference_wrapper.hpp>
     35#include <cassert>
    3536#include <tuple>
    3637#include <type_traits>
     
    133134                constexpr decltype(auto) operator[](const bind_t<R, B, F, BindArgs...> b)
    134135                {
     136                    __unimplemented();
    135137                    return b; // TODO: bind subexpressions
    136138                }
Note: See TracChangeset for help on using the changeset viewer.