Compiling with clang and gcc with -Wshadow

See issue #17

Somewhere along the way we've also broken our ability to compile with GCC 4.7.3.  We'll have to decide if we care about
supporting 4.7.3 or not.  The changes that break this are:

-there is no emplace in std::map (or related) in 4.7.3
-there are some enable_ifs in rapidjson's writer.h that are always false (which is fine), but
GCC 4.7.3 doesn't like this

Author: AzothAmmo

Makefile

@@ -1,4 +1,4 @@
-CPPFLAGS=-std=c++11 -I./include -Wall -Werror -g -Wextra
+CPPFLAGS=-std=c++11 -I./include -Wall -Werror -g -Wextra -Wshadow
 CXX=g++
 COVERAGE_OUTPUT=out
 

include/cereal/archives/json.hpp

@@ -407,11 +407,11 @@ namespace cereal
 
           //! Adjust our position such that we are at the node with the given name
           /*! @throws Exception if no such named node exists */
-          inline void search( const char * name )//, GenericValue const & parent )
+          inline void search( const char * searchName )//, GenericValue const & parent )
           {
             size_t index = 0;
             for( auto it = itsMemberItBegin; it != itsMemberItEnd; ++it, ++index )
-              if( std::strcmp( name, it->name.GetString() ) == 0 )
+              if( std::strcmp( searchName, it->name.GetString() ) == 0 )
               {
                 itsIndex = index;
                 return;

include/cereal/archives/xml.hpp

@@ -587,18 +587,18 @@ namespace cereal
         }
 
         //! Searches for a child with the given name in this node
-        /*! @param name The name to search for (must be null terminated)
+        /*! @param searchName The name to search for (must be null terminated)
             @return The node if found, nullptr otherwise */
-        rapidxml::xml_node<> * search( const char * name )
+        rapidxml::xml_node<> * search( const char * searchName )
         {
-          if( name )
+          if( searchName )
           {
             size_t new_size = XMLInputArchive::getNumChildren( node );
-            size_t name_size = rapidxml::internal::measure( name );
+            size_t name_size = rapidxml::internal::measure( searchName );
 
             for( auto new_child = node->first_node(); new_child != nullptr; new_child = new_child->next_sibling() )
             {
-              if( rapidxml::internal::compare( new_child->name(), new_child->name_size(), name, name_size, true ) )
+              if( rapidxml::internal::compare( new_child->name(), new_child->name_size(), searchName, name_size, true ) )
               {
                 size = new_size;
                 child = new_child;

include/cereal/cereal.hpp

@@ -48,8 +48,8 @@ namespace cereal
   /*! @ingroup Utility */
   struct Exception : public std::runtime_error
   {
-    Exception( const std::string& what ) : std::runtime_error(what) {}
-    Exception( const char* what ) : std::runtime_error(what) {}
+    Exception( const std::string& what_ ) : std::runtime_error(what_) {}
+    Exception( const char* what_ ) : std::runtime_error(what_) {}
   };
 
   // ######################################################################
@@ -234,8 +234,8 @@ namespace cereal
   {
     public:
       //! Construct the output archive
-      /*! @param self A pointer to the derived ArchiveType (pass this from the derived archive) */
-      OutputArchive(ArchiveType * const self) : self(self), itsCurrentPointerId(1), itsCurrentPolymorphicTypeId(1)
+      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
+      OutputArchive(ArchiveType * const derived) : self(derived), itsCurrentPointerId(1), itsCurrentPolymorphicTypeId(1)
       { }
 
       //! Serializes all passed in data
@@ -540,8 +540,8 @@ namespace cereal
   {
     public:
       //! Construct the output archive
-      /*! @param self A pointer to the derived ArchiveType (pass this from the derived archive) */
-      InputArchive(ArchiveType * const self) : self(self) { }
+      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
+      InputArchive(ArchiveType * const derived) : self(derived) { }
 
       //! Serializes all passed in data
       template <class ... Types> inline

include/cereal/details/helpers.hpp

@@ -285,7 +285,7 @@ namespace cereal
 
     //! Construct a MapItem from a key and a value
     /*! @internal */
-    MapItem( Key && key, Value && value ) : key(const_cast<KeyType>(key)), value(const_cast<ValueType>(value)) {}
+    MapItem( Key && key_, Value && value_ ) : key(const_cast<KeyType>(key_)), value(const_cast<ValueType>(value_)) {}
 
     KeyType key;
     ValueType value;