Skip to content

Commit

Permalink
Change 'static inline' to just 'inline'.
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadden committed Aug 2, 2018
1 parent a1f13ca commit 8317ece
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
5 changes: 3 additions & 2 deletions src/alia/actions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct action
};

// Perform an action.
void static inline perform_action(action const& a)
void inline perform_action(action const& a)
{
assert(a.is_ready());
a.perform();
Expand Down Expand Up @@ -67,7 +67,8 @@ struct action_ref : action
// ref(action_ptr) wraps a pointer to an action so that it can be passed around
// as an action. The referenced action must remain valid for the life of the
// wrapper.
action_ref static inline ref(action const* action_ptr)
inline action_ref
ref(action const* action_ptr)
{
return action_ref(action_ptr);
}
Expand Down
2 changes: 1 addition & 1 deletion src/alia/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ invoke_hash(T const& x)
}

// Combine two hash values.
static inline size_t
inline size_t
combine_hashes(size_t a, size_t b)
{
return a ^ (0x9e3779b9 + (a << 6) + (a >> 2) + b);
Expand Down
6 changes: 3 additions & 3 deletions src/alia/data_graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct data_traversal

// If using this library directly, the data_traversal itself can serve as the
// context.
static inline data_traversal&
inline data_traversal&
get_data_traversal(data_traversal& ctx)
{
return ctx;
Expand Down Expand Up @@ -333,12 +333,12 @@ struct naming_context : noncopyable
data_traversal* traversal_;
naming_map* map_;
};
static inline data_traversal&
inline data_traversal&
get_data_traversal(naming_context& ctx)
{
return ctx.traversal();
}
static inline naming_map&
inline naming_map&
get_naming_map(naming_context& ctx)
{
return ctx.map();
Expand Down
2 changes: 1 addition & 1 deletion src/alia/event_routing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct event_routing_traversal
event_routing_path* path_to_target;
};

static inline routing_region_ptr
inline routing_region_ptr
get_active_region(event_routing_traversal const& traversal)
{
return traversal.active_region ? *traversal.active_region
Expand Down
2 changes: 1 addition & 1 deletion src/alia/id.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace alia {

static inline bool
inline bool
types_match(id_interface const& a, id_interface const& b)
{
return typeid(a).name() == typeid(b).name() || typeid(a) == typeid(b);
Expand Down
8 changes: 4 additions & 4 deletions src/alia/id.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct id_interface
// The following convert the interface of the ID operations into the usual form
// that one would expect, as free functions.

static inline bool
inline bool
operator==(id_interface const& a, id_interface const& b)
{
// Apparently it's faster to compare the name pointers for equality before
Expand All @@ -58,7 +58,7 @@ operator==(id_interface const& a, id_interface const& b)
&& a.equals(b);
}

static inline bool
inline bool
operator!=(id_interface const& a, id_interface const& b)
{
return !(a == b);
Expand All @@ -67,7 +67,7 @@ operator!=(id_interface const& a, id_interface const& b)
bool
operator<(id_interface const& a, id_interface const& b);

static inline std::ostream&
inline std::ostream&
operator<<(std::ostream& o, id_interface const& id)
{
id.stream(o);
Expand Down Expand Up @@ -235,7 +235,7 @@ struct id_ref : id_interface
id_interface const* id_;
std::shared_ptr<id_interface> ownership_;
};
static inline id_ref
inline id_ref
ref(id_interface const& id)
{
return id_ref(id);
Expand Down
4 changes: 2 additions & 2 deletions src/alia/signals/lambdas.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ lambda_bidirectional(

// This is just a clear and concise way of indicating that a lambda signal is
// always readable.
static inline bool
inline bool
always_readable()
{
return true;
}

// This is just a clear and concise way of indicating that a lambda signal is
// always writable.
static inline bool
inline bool
always_writable()
{
return true;
Expand Down

0 comments on commit 8317ece

Please sign in to comment.