Skip to content

Commit

Permalink
Merge pull request #399 from lf-lang/update-rti-dockerfile
Browse files Browse the repository at this point in the history 
Update RTI dockerfile to match file layout change
  • Loading branch information
@petervdonovan
petervdonovan authored Apr 1, 2024
2 parents 75fcdba + 2a3c257 commit ec06c93
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions core/federated/RTI/rti.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Docker file for building the image of the rti
FROM alpine:latest
COPY core /lingua-franca/core
COPY include /lingua-franca/include
COPY . /lingua-franca
WORKDIR /lingua-franca/core/federated/RTI
RUN set -ex && apk add --no-cache gcc musl-dev cmake make && \
mkdir container && \
Expand Down
3 changes: 0 additions & 3 deletions include/core/federated/network/net_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
do { \
buffer[0] = MSG_TYPE_STOP_REQUEST; \
encode_int64(time, &(buffer[1])); \
assert(microstep >= 0); \
encode_int32((int32_t)microstep, &(buffer[1 + sizeof(instant_t)])); \
} while (0)

Expand All @@ -501,7 +500,6 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
do { \
buffer[0] = MSG_TYPE_STOP_REQUEST_REPLY; \
encode_int64(time, &(buffer[1])); \
assert(microstep >= 0); \
encode_int32((int32_t)microstep, &(buffer[1 + sizeof(instant_t)])); \
} while (0)

Expand All @@ -518,7 +516,6 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
do { \
buffer[0] = MSG_TYPE_STOP_GRANTED; \
encode_int64(time, &(buffer[1])); \
assert(microstep >= 0); \
encode_int32((int32_t)microstep, &(buffer[1 + sizeof(instant_t)])); \
} while (0)

Expand Down

0 comments on commit ec06c93

Please sign in to comment.