Removes Conan build step, adds documentation to dictionary.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2021-09-26 10:47:19 +02:00
parent dbf6fbc1db
commit 78d4513a4d
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 3 additions and 19 deletions

View File

@ -50,24 +50,6 @@ steps:
commands: commands:
- ( cat Doxyfile ; echo "WARN_AS_ERROR=YES" ) | doxygen - - ( cat Doxyfile ; echo "WARN_AS_ERROR=YES" ) | doxygen -
- rm -rf docs - rm -rf docs
- name: conan-deploy
image: deukhoofd/linux64builder
environment:
CONAN_LOGIN_USERNAME:
from_secret: conan_username
CONAN_PASSWORD:
from_secret: conan_password
commands:
- rm -rf build-debug
- rm -rf build-release-windows
- cmake -GNinja -DCMAKE_BUILD_TYPE=Release . -B build-conan -D CMAKE_C_COMPILER=/usr/bin/clang -D CMAKE_CXX_COMPILER=clang++ -DWINDOWS=0
- conan export-pkg . $DRONE_COMMIT@epsilon/$DRONE_BRANCH --build-folder build-conan -s compiler='clang' -s compiler.version=8 -s compiler.libcxx='libstdc++11'
- conan alias Arbutils/latest@epsilon/$DRONE_BRANCH Arbutils/$DRONE_COMMIT@epsilon/$DRONE_BRANCH
- conan remote add epsilon-public https://packages.p-epsilon.com/
- conan user -p -r=epsilon-public
- conan upload Arbutils/$DRONE_COMMIT@epsilon/$DRONE_BRANCH --all -r=epsilon-public --force
- conan upload Arbutils/latest@epsilon/$DRONE_BRANCH --all -r=epsilon-public
- conan user --clean
- name: documentation-publish - name: documentation-publish
image: deukhoofd/linux64builder image: deukhoofd/linux64builder
when: when:
@ -85,6 +67,6 @@ volumes:
path: /home/docs/Arbutils path: /home/docs/Arbutils
--- ---
kind: signature kind: signature
hmac: 3d066e962d009231ed1f92c268400088aae34a7858a3a3bfc72c3244c6452526 hmac: 8ddbae90cccc2e7abc009880a801610bbcadd334a1a6180717cca68feea48afb
... ...

View File

@ -12,7 +12,9 @@ namespace ArbUt {
using const_iterator = typename std::unordered_map<KeyT, ValueT>::const_iterator; using const_iterator = typename std::unordered_map<KeyT, ValueT>::const_iterator;
public: public:
/// @brief The type used for the indexer of the dictionary.
typedef KeyT keyType; typedef KeyT keyType;
/// @brief The type used for the value in the dictionary.
typedef ValueT valueType; typedef ValueT valueType;
Dictionary() : _map() {} Dictionary() : _map() {}