vk_mem_alloc.h: Small fix found by clang compilation. .travis.yml: cleanup.

This commit is contained in:
Adam Sawicki 2017-08-21 17:06:45 +02:00
parent 01441d99a4
commit 8dad535a9c
2 changed files with 3 additions and 5 deletions

View File

@ -12,14 +12,13 @@ compiler:
- gcc - gcc
before_script: before_script:
- sudo apt-get -qq update - sudo apt-get install
- sudo apt-get install -y libassimp-dev libx11-xcb-dev libxrandr-dev
install: install:
- wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha11/premake-5.0.0-alpha11-linux.tar.gz - wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha11/premake-5.0.0-alpha11-linux.tar.gz
- tar -xzvf premake-5.0.0-alpha11-linux.tar.gz - tar -xzvf premake-5.0.0-alpha11-linux.tar.gz
- sudo apt-get update - sudo apt-get -qq update
- sudo apt-get install libglm-dev graphviz libxcb-dri3-0 libxcb-present0 libpciaccess0 cmake libpng-dev libxcb-dri3-dev libx11-dev libmirclient-dev libwayland-dev libxrandr-dev - sudo apt-get install -y libassimp-dev libglm-dev graphviz libxcb-dri3-0 libxcb-present0 libpciaccess0 cmake libpng-dev libxcb-dri3-dev libx11-dev libx11-xcb-dev libmirclient-dev libwayland-dev libxrandr-dev
- wget -O vulkansdk-linux-x86_64-1.0.51.0.run https://vulkan.lunarg.com/sdk/download/1.0.51.0/linux/vulkansdk-linux-x86_64-1.0.51.0.run - wget -O vulkansdk-linux-x86_64-1.0.51.0.run https://vulkan.lunarg.com/sdk/download/1.0.51.0/linux/vulkansdk-linux-x86_64-1.0.51.0.run
- chmod ugo+x vulkansdk-linux-x86_64-1.0.51.0.run - chmod ugo+x vulkansdk-linux-x86_64-1.0.51.0.run
- ./vulkansdk-linux-x86_64-1.0.51.0.run - ./vulkansdk-linux-x86_64-1.0.51.0.run

View File

@ -1964,7 +1964,6 @@ public:
} }
friend class VmaList<T, AllocatorT>; friend class VmaList<T, AllocatorT>;
friend class VmaList<T, AllocatorT>:: const_iterator;
}; };
class const_iterator class const_iterator