Commit dd054907 authored by Davis King's avatar Davis King

Minor changes to avoid compiler errors in visual studio 2012

parent fc3ce10a
...@@ -33,7 +33,7 @@ namespace dlib ...@@ -33,7 +33,7 @@ namespace dlib
using whatever dlib memory manager you supply. using whatever dlib memory manager you supply.
Thus, using this allocator object you can use any of the dlib memory manager objects with Thus, using this allocator object you can use any of the dlib memory manager objects with
the contains in the STL or with any other object that requires a C++ allocator object. the containers in the STL or with any other object that requires a C++ allocator object.
It is important to note that many STL implementations make the assumption that the memory It is important to note that many STL implementations make the assumption that the memory
allocated by one allocator can be freed by another. This effectively means that you should allocated by one allocator can be freed by another. This effectively means that you should
...@@ -119,6 +119,8 @@ namespace dlib ...@@ -119,6 +119,8 @@ namespace dlib
pool.swap(item.pool); pool.swap(item.pool);
} }
std_allocator& operator= (const std_allocator&) { return *this;}
private: private:
typename M::template rebind<char>::other pool; typename M::template rebind<char>::other pool;
}; };
......
...@@ -75,6 +75,8 @@ namespace ...@@ -75,6 +75,8 @@ namespace
print_spinner(); print_spinner();
using dlib::tuple;
tuple<> a; tuple<> a;
tuple<int> b; tuple<int> b;
tuple<int, float> c; tuple<int, float> c;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment