From b2a1b7f69df26b62ad739ed9059b07580601ed4f Mon Sep 17 00:00:00 2001
From: Wataru Ishida <wataru.ishid@gmail.com>
Date: Sat, 27 Jun 2020 01:21:58 +0000
Subject: [PATCH] mux: update the TAI submodule

Signed-off-by: Wataru Ishida <wataru.ishid@gmail.com>
---
 .travis.yml                  | 2 +-
 tai_mux/Makefile             | 4 ++--
 tai_mux/mux.cpp              | 2 +-
 tai_mux/oopt-tai             | 2 +-
 tai_mux/platform_adapter.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5eae512..e54501c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ services:
   - docker
 
 before_install:
-  - make -C tai_mux docker-image
+  - make -C tai_mux builder
 
 script:
   - TAI_DOCKER_CMD='make test' make -C tai_mux cmd
diff --git a/tai_mux/Makefile b/tai_mux/Makefile
index 48c1621..4de8f79 100644
--- a/tai_mux/Makefile
+++ b/tai_mux/Makefile
@@ -34,7 +34,7 @@ HEADERS := $(wildcard *.hpp $(TAI_LIB_DIR)/*.hpp $(TAI_FRAMEWORK_DIR)/*.hpp)
 OBJECTS := $(addprefix $(BUILDDIR)/,$(SOURCES:%.cpp=%.o))
 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)
 
@@ -61,7 +61,7 @@ cmd:
 docker:
 	TAI_DOCKER_CMD="make" $(MAKE) cmd
 
-docker-image:
+builder:
 	$(MAKE) -C $(TAI_DIR) $@
 
 bash:
diff --git a/tai_mux/mux.cpp b/tai_mux/mux.cpp
index f765dc3..a292732 100644
--- a/tai_mux/mux.cpp
+++ b/tai_mux/mux.cpp
@@ -41,7 +41,7 @@ namespace tai::mux {
             m_pa = std::make_shared<StaticPlatformAdapter>(0, services);
             break;
         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);
         }
     }
diff --git a/tai_mux/oopt-tai b/tai_mux/oopt-tai
index 4ca1e6d..0a483c5 160000
--- a/tai_mux/oopt-tai
+++ b/tai_mux/oopt-tai
@@ -1 +1 @@
-Subproject commit 4ca1e6d61fecd118f4c08c72663d53dde6d145ef
+Subproject commit 0a483c5c955af17b744238d7987dfee8ca6caf31
diff --git a/tai_mux/platform_adapter.cpp b/tai_mux/platform_adapter.cpp
index a1d8330..0a1441a 100644
--- a/tai_mux/platform_adapter.cpp
+++ b/tai_mux/platform_adapter.cpp
@@ -27,7 +27,7 @@ namespace tai::mux {
             auto dst = std::make_shared<Attribute>(meta, src);
             auto ret = convert_oid(ctx->object_type, oid, dst, dst, true);
             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;
             }
             attrs.emplace_back(dst);