From 2ac3e27229ecc16eb567855fc3f60aa535a075c2 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Mon, 4 Aug 2014 21:05:47 -0400
Subject: [PATCH] Update travis script, fix warnings.

---
 .travis.yml            | 2 +-
 sol/function_types.hpp | 2 +-
 sol/userdata.hpp       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d395fad2..e522e63f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
     - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
     - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
     - sudo apt-get --yes update
-    - if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.8; export CXX=g++-4.8; fi
+    - sudo apt-get --yes install g++-4.8
     - sudo apt-get --yes install ninja-build
     - sudo apt-get --yes install liblua5.2-dev
 
diff --git a/sol/function_types.hpp b/sol/function_types.hpp
index 87ab95dc..857b1027 100644
--- a/sol/function_types.hpp
+++ b/sol/function_types.hpp
@@ -70,7 +70,7 @@ struct functor<T, Func, R, true> {
     functor(FxArgs&&... fxargs): item(nullptr), invocation(std::forward<FxArgs>(fxargs)...) {}
 
     template<typename Arg, typename... Args>
-    void operator()(Arg&& arg, Args&&... args) {
+    void operator()(Arg&& arg, Args&&...) {
         T& member = *item;
         (member.*invocation) = std::forward<Arg>(arg);
     }
diff --git a/sol/userdata.hpp b/sol/userdata.hpp
index 34b68f4b..c26d7045 100644
--- a/sol/userdata.hpp
+++ b/sol/userdata.hpp
@@ -314,13 +314,13 @@ private:
 };
 
 template <typename T>
-const std::array<std::string, 2> userdata<T>::metavariablenames = {
+const std::array<std::string, 2> userdata<T>::metavariablenames = {{
     "__index",
     "__newindex"
-};
+}};
 
 template <typename T>
-const std::array<std::string, 19> userdata<T>::metafunctionnames = {
+const std::array<std::string, 19> userdata<T>::metafunctionnames = {{
     "__index",
     "__newindex",
     "__mode",
@@ -340,7 +340,7 @@ const std::array<std::string, 19> userdata<T>::metafunctionnames = {
     "__eq",
     "__lt",
     "__le",
-};
+}};
 
 namespace stack {
 template <typename T>