commit 8dad535a9c3590ad357d0c08a3c3703acd0c5349
author Adam Sawicki <Adam.Sawicki@amd.com> Mon Aug 21 17:06:45 2017 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> Mon Aug 21 17:06:45 2017 +0200
tree 264b4e321ba434c1924a734619837610f9b9b001
parent 01441d99a4590a31ab5c1c2a05bbf21eaea8ecd2

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 463c15c..76d30f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,13 @@
   - gcc

 

 before_script:

-  - sudo apt-get -qq update

-  - sudo apt-get install -y libassimp-dev libx11-xcb-dev libxrandr-dev

+  - sudo apt-get install 

 

 install:

   - 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

-  - sudo apt-get 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 -qq update

+  - 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

   - chmod ugo+x vulkansdk-linux-x86_64-1.0.51.0.run

   - ./vulkansdk-linux-x86_64-1.0.51.0.run

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 4d73652..6039e22 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -1964,7 +1964,6 @@
         }

 

         friend class VmaList<T, AllocatorT>;

-        friend class VmaList<T, AllocatorT>:: const_iterator;

     };

 

     class const_iterator