scottk/oopt-tai-implementations
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-tai-implementations.git synced 2025-10-29 17:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mux: update the TAI submodule

Browse Source 
Signed-off-by: Wataru Ishida <wataru.ishid@gmail.com>
This commit is contained in:
Wataru Ishida
2020-06-27 01:21:58 +00:00
parent 684ed69d3a
commit b2a1b7f69d
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -6,7 +6,7 @@ services:
- docker - docker
before_install: before_install:
- make -C tai_mux docker-image - make -C tai_mux builder
script: script:
- TAI_DOCKER_CMD='make test' make -C tai_mux cmd - TAI_DOCKER_CMD='make test' make -C tai_mux cmd

4
tai_mux/Makefile
View File

@@ -34,7 +34,7 @@ HEADERS := $(wildcard *.hpp $(TAI_LIB_DIR)/*.hpp $(TAI_FRAMEWORK_DIR)/*.hpp)
OBJECTS := $(addprefix $(BUILDDIR)/,$(SOURCES:%.cpp=%.o)) OBJECTS := $(addprefix $(BUILDDIR)/,$(SOURCES:%.cpp=%.o))
DEPS := $(addprefix $(BUILDDIR)/,$(SOURCES:%.cpp=%.d)) DEPS := $(addprefix $(BUILDDIR)/,$(SOURCES:%.cpp=%.d))
.PHONY = all meta test cmd docker docker-image bash clean clean-all .PHONY = all meta test cmd docker builder bash clean clean-all
all: $(PROG) all: $(PROG)
@@ -61,7 +61,7 @@ cmd:
docker: docker:
TAI_DOCKER_CMD="make" $(MAKE) cmd TAI_DOCKER_CMD="make" $(MAKE) cmd
docker-image: builder:
$(MAKE) -C $(TAI_DIR) $@ $(MAKE) -C $(TAI_DIR) $@
bash: bash:

2
tai_mux/mux.cpp
View File

@@ -41,7 +41,7 @@ namespace tai::mux {
m_pa = std::make_shared<StaticPlatformAdapter>(0, services); m_pa = std::make_shared<StaticPlatformAdapter>(0, services);
break; break;
default: default:
ERROR("unsupported platform_adapter: %s", pa_name.c_str()); TAI_ERROR("unsupported platform_adapter: %s", pa_name.c_str());
throw Exception(TAI_STATUS_NOT_SUPPORTED); throw Exception(TAI_STATUS_NOT_SUPPORTED);
} }
} }

2
tai_mux/oopt-tai

Submodule tai_mux/oopt-tai updated: 4ca1e6d61f...0a483c5c95

2
tai_mux/platform_adapter.cpp
View File

@@ -27,7 +27,7 @@ namespace tai::mux {
auto dst = std::make_shared<Attribute>(meta, src); auto dst = std::make_shared<Attribute>(meta, src);
auto ret = convert_oid(ctx->object_type, oid, dst, dst, true); auto ret = convert_oid(ctx->object_type, oid, dst, dst, true);
if ( ret != TAI_STATUS_SUCCESS ) { if ( ret != TAI_STATUS_SUCCESS ) {
ERROR("failed to convert oid of attribute: %d", src.id); TAI_ERROR("failed to convert oid of attribute: %d", src.id);
continue; continue;
} }
attrs.emplace_back(dst); attrs.emplace_back(dst);