From b57308e4a134fb6139d2cb52a031d3e7185f16cf Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 5 Apr 2017 02:32:06 +0200
Subject: Use override

---
 jrt_test/src/jrt-test/simpleserver/simpleserver.cpp         | 6 ++----
 jrt_test/src/tests/echo/echo-client.cpp                     | 5 ++---
 jrt_test/src/tests/mandatory-methods/extract-reflection.cpp | 2 +-
 jrt_test/src/tests/mockup-invoke/mockup-server.cpp          | 6 ++----
 jrt_test/src/tests/rpc-error/test-errors.cpp                | 1 -
 5 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'jrt_test')

diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
index 75defdc3881..19ebdb253a3 100644
--- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
+++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("simpleserver");
-#include <vespa/fastos/fastos.h>
-#include <vespa/fnet/frt/frt.h>
 
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class Server : public FRT_Invokable
 {
diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp
index 2d72cdc937b..14faac3ca9e 100644
--- a/jrt_test/src/tests/echo/echo-client.cpp
+++ b/jrt_test/src/tests/echo/echo-client.cpp
@@ -1,8 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("echo_client");
-#include <vespa/fastos/fastos.h>
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class EchoClient : public FastOS_Application
 {
diff --git a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
index 98584e9a284..9857ea073c2 100644
--- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
+++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
+#include <vespa/fastos/app.h>
 #include <vespa/fnet/frt/frt.h>
 
 class RPCInfo : public FastOS_Application
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
index 46a1e2bc11a..41624eaf108 100644
--- a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
+++ b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("mockup_server");
-#include <vespa/fastos/fastos.h>
-#include <vespa/fnet/frt/frt.h>
 
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class MockupServer : public FRT_Invokable
 {
diff --git a/jrt_test/src/tests/rpc-error/test-errors.cpp b/jrt_test/src/tests/rpc-error/test-errors.cpp
index 07ff7425f9a..184e733da82 100644
--- a/jrt_test/src/tests/rpc-error/test-errors.cpp
+++ b/jrt_test/src/tests/rpc-error/test-errors.cpp
@@ -2,7 +2,6 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/fnet/frt/frt.h>
 
-
 class TestErrors : public vespalib::TestApp
 {
 private:
-- 
cgit v1.2.3