Skip to content

Commit

Permalink
Merge branch 'master' into refactor-only-comm-type
Browse files Browse the repository at this point in the history 
# Conflicts:
#	core/src/main/resources/lib/c/reactor-c
  • Loading branch information
@hokeun
hokeun committed Dec 28, 2024
2 parents 4c3743d + 5f600a4 commit 336d0a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Submodule reactor-c updated 12 files
+0 −1 core/federated/RTI/CMakeLists.txt
+157 −17 core/federated/RTI/rti_remote.c
+2 −1 core/federated/RTI/rti_remote.h
+0 −1 core/federated/clock-sync.c
+232 −63 core/federated/federate.c
+1 −1 core/federated/network/CMakeLists.txt
+178 −0 core/federated/network/net_util.c
+0 −410 core/federated/network/socket_common.c
+1 −1 core/threaded/reactor_threaded.c
+53 −0 include/core/federated/network/net_common.h
+122 −2 include/core/federated/network/net_util.h
+0 −232 include/core/federated/network/socket_common.h

0 comments on commit 336d0a3

Please sign in to comment.