diff options
author | Rob Hughes <robert.hughes@arm.com> | 2021-07-14 09:48:54 +0100 |
---|---|---|
committer | Rob Hughes <robert.hughes@arm.com> | 2021-07-21 14:09:51 +0000 |
commit | 9542f90d82a42096166d72109683abc165072297 (patch) | |
tree | 1f519b437ef83eed67419f52e1326f6d909e2467 /src/armnnUtils | |
parent | 9021125ff83a035dae05e5c7c0e6b1455b71af1a (diff) | |
download | armnn-9542f90d82a42096166d72109683abc165072297.tar.gz |
NNXSW-3081 Move Filesystem.hpp and Threads.hpp to public include
!android-nn-driver:5966
Change-Id: Ice0b4d2872bb0e09bfc0763034a206c3a8f24af4
Signed-off-by: Rob Hughes <robert.hughes@arm.com>
Diffstat (limited to 'src/armnnUtils')
-rw-r--r-- | src/armnnUtils/Filesystem.cpp | 2 | ||||
-rw-r--r-- | src/armnnUtils/Filesystem.hpp | 25 | ||||
-rw-r--r-- | src/armnnUtils/Threads.cpp | 2 | ||||
-rw-r--r-- | src/armnnUtils/Threads.hpp | 16 |
4 files changed, 2 insertions, 43 deletions
diff --git a/src/armnnUtils/Filesystem.cpp b/src/armnnUtils/Filesystem.cpp index 59d05239ae..1f636d895f 100644 --- a/src/armnnUtils/Filesystem.cpp +++ b/src/armnnUtils/Filesystem.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Filesystem.hpp" +#include <armnnUtils/Filesystem.hpp> namespace armnnUtils { diff --git a/src/armnnUtils/Filesystem.hpp b/src/armnnUtils/Filesystem.hpp deleted file mode 100644 index ba0d97a272..0000000000 --- a/src/armnnUtils/Filesystem.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#if defined(_MSC_VER) -// ghc includes Windows.h directly, bringing in macros that we don't want (e.g. min/max). -// By including Windows.h ourselves first (with appropriate options), we prevent this. -#include <common/include/WindowsWrapper.hpp> -#endif -#include <ghc/filesystem.hpp> -namespace fs = ghc::filesystem; - -namespace armnnUtils -{ -namespace Filesystem -{ - -/// Returns a path to a file in the system temporary folder. If the file existed it will be deleted. -fs::path NamedTempFile(const char* fileName); - -} -} diff --git a/src/armnnUtils/Threads.cpp b/src/armnnUtils/Threads.cpp index e5cf27622c..4cdea6654a 100644 --- a/src/armnnUtils/Threads.cpp +++ b/src/armnnUtils/Threads.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Threads.hpp" +#include <armnnUtils/Threads.hpp> #if defined(__linux__) #include <unistd.h> diff --git a/src/armnnUtils/Threads.hpp b/src/armnnUtils/Threads.hpp deleted file mode 100644 index 4cecfd5079..0000000000 --- a/src/armnnUtils/Threads.hpp +++ /dev/null @@ -1,16 +0,0 @@ -// -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -namespace armnnUtils -{ -namespace Threads -{ - -int GetCurrentThreadId(); - -} -} |