Commit 3aae0bd1 authored by Filip Hauzvic's avatar Filip Hauzvic
Browse files

Add std namespace to integer types

parent 1f11ee38

net/include/net/driver.hpp

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ namespace net 
        bool start_server(int port, int max_connections);

        bool start_client(std::string address, int port);

        SendResult send(

            ConnectionId peer, std::span<const uint8_t> data,

            ConnectionId peer, std::span<const std::uint8_t> data,

            ReliabilityMode reliability = ReliabilityMode::UNRELIABLE,

            OrderingMode ordering = OrderingMode::UNORDERED,

            int channel = 0);

        SendResult broadcast(

            std::span<const uint8_t> data,

            std::span<const std::uint8_t> data,

            ReliabilityMode reliability = ReliabilityMode::UNRELIABLE,

            OrderingMode ordering = OrderingMode::UNORDERED,

            int channel = 0);

net/include/net/types.hpp

+8 −8
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
#include <com/reflection.hpp>



namespace net {

    using ConnectionId = uint32_t;

    using ConnectionId = std::uint32_t;

    constexpr ConnectionId SERVER_ID = 0;

    constexpr ConnectionId BROADCAST_ID = static_cast<ConnectionId>(-1);

    constexpr ConnectionId BROADCAST_ID = std::numeric_limits<std::uint32_t>::max();



    struct Connection

    {
@@ -41,20 +41,20 @@ namespace net { 
        double time_since_last_send = 0.0;

    };



    enum class PacketType : uint8_t

    enum class PacketType : std::uint8_t

    {

        RPC = 1,

        REPLICATION

    };



    enum class SocketMode : uint8_t

    enum class SocketMode : std::uint8_t

    {

        SERVER,

        CLIENT,

        NONE

    };



    enum class SendResult : uint8_t

    enum class SendResult : std::uint8_t

    {

        SUCCESS,

        NOT_CONNECTED,
@@ -64,19 +64,19 @@ namespace net { 
        BROADCAST_INCOMPLETE

    };



    enum class ReliabilityMode : uint8_t

    enum class ReliabilityMode : std::uint8_t

    {

        UNRELIABLE,

        RELIABLE

    };



    enum class OrderingMode : uint8_t

    enum class OrderingMode : std::uint8_t

    {

        UNORDERED,

        ORDERED

    };



    enum class ConnectionStatus : uint8_t

    enum class ConnectionStatus : std::uint8_t

    {

        DISCONNECTED,

        CONNECTING,

net/src/driver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ bool Driver::start_client(std::string address, int port) 
}



SendResult Driver::send(

    ConnectionId peer, std::span<const uint8_t> data,

    ConnectionId peer, std::span<const std::uint8_t> data,

    ReliabilityMode reliability,

    OrderingMode ordering,

    int channel)
@@ -71,7 +71,7 @@ SendResult Driver::send( 
}



SendResult Driver::broadcast(

    std::span<const uint8_t> data,

    std::span<const std::uint8_t> data,

    ReliabilityMode reliability,

    OrderingMode ordering,

    int channel)

net/src/replication_system.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ namespace net { 


                    int written_bytes = 0;

                    auto buffer = create_packet(prop, current_value, written_bytes);

                    std::span<const uint8_t> buffer_span(buffer.data(), written_bytes);

                    std::span<const std::uint8_t> buffer_span(buffer.data(), written_bytes);

                    driver()->broadcast(buffer_span, ReliabilityMode::UNRELIABLE);



                    prop.time_since_last_send = 0.0;

net/src/rpc_system.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void RPCSystem::call_remote( 
{

    int written_bytes = 0;

    auto buffer = create_packet(context_item, method_name, params, written_bytes);

    std::span<const uint8_t> buffer_span(buffer.data(), written_bytes);

    std::span<const std::uint8_t> buffer_span(buffer.data(), written_bytes);

    if (target == BROADCAST_ID)

    {

        driver()->broadcast(buffer_span, reliability);