fix more types and turn on benchmarks build on appveyor and travis

.appveyor.yml

@@ -13,7 +13,7 @@ init: []
 install: []
 before_build:
 - git submodule update --init --recursive --remote
-- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSTATIC=%STATIC% -DSAMPLES=ON
+- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON
 
 build:
   project: build/xlnt_all.sln

.travis.yml

@@ -26,6 +26,7 @@ matrix:
         - COVERAGE=ON
         - STATIC=ON
         - SAMPLES=OFF
+        - BENCHMARKS=OFF
 
     - os: linux
       compiler: gcc
@@ -41,11 +42,12 @@ matrix:
         - COVERAGE=OFF
         - STATIC=OFF
         - SAMPLES=ON
+        - BENCHMARKS=ON
 
 script:
   - mkdir build
   - cd build
-  - cmake -D STATIC=$STATIC -D SAMPLES=$SAMPLES -D COVERAGE=$COVERAGE -D CMAKE_CXX_COMPILER=$COMPILER -D CMAKE_BUILD_TYPE=Debug ..
+  - cmake -D STATIC=$STATIC -D BENCHMARKS=$BENCHMARKS -D SAMPLES=$SAMPLES -D COVERAGE=$COVERAGE -D CMAKE_CXX_COMPILER=$COMPILER -D CMAKE_BUILD_TYPE=Debug ..
   - cmake --build .
   - cd bin && ./xlnt.test
   - cd ..

include/xlnt/worksheet/cell_vector.hpp

@@ -104,7 +104,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    cell cell(std::size_t column_index);
+    class cell cell(std::size_t column_index);
 
     /// <summary>
     ///

include/xlnt/worksheet/range.hpp

@@ -114,7 +114,7 @@ public:
     /// <summary>
     ///
     /// </summary>
-    cell cell(const cell_reference &ref);
+    class cell cell(const cell_reference &ref);
 
     /// <summary>
     ///

source/detail/xlsx_consumer.hpp

@@ -333,7 +333,7 @@ private:
     /// <summary>
     /// Convenience method to access the target workbook's manifest.
     /// </summary>
-    manifest &manifest();
+    class manifest &manifest();
 
 	/// <summary>
 	/// The ZIP file containing the files that make up the OOXML package.