Renamed defer() -> defer_serialization()

- This avoids a name conflict with a utility macro in Gemcutter

Author: EmilianC

include/cereal/cereal.hpp

@@ -119,7 +119,7 @@ namespace cereal
         void serialize(Archive & archive)
         {
           // when we serialize an edge, we'll defer serializing the associated node
-          archive( cereal::defer( connection ),
+          archive( cereal::defer_serialization( connection ),
                    some_value );
         }
       };
@@ -146,7 +146,7 @@ namespace cereal
       @relates DeferredData
       @ingroup Utility */
   template <class T> inline
-  DeferredData<T> defer( T && value )
+  DeferredData<T> defer_serialization( T && value )
   {
     return {std::forward<T>(value)};
   }

unittests/defer.hpp

@@ -75,11 +75,11 @@ struct DeferNode
   void serialize( Archive & ar )
   {
     ar( id, w,
-        cereal::defer( iser ),
-        cereal::defer( ispl ),
-        cereal::defer( eser ),
-        cereal::defer( espl ),
-        cereal::defer( relations ),
+        cereal::defer_serialization( iser ),
+        cereal::defer_serialization( ispl ),
+        cereal::defer_serialization( eser ),
+        cereal::defer_serialization( espl ),
+        cereal::defer_serialization( relations ),
         z );
   }