Some renaming / restructuring

Author: kevinushey

inst/include/Rcpp/hash/IndexHash.h

@@ -160,7 +160,7 @@ namespace Rcpp{
         }
 
         inline bool not_equal(const STORAGE& lhs, const STORAGE& rhs) {
-            return ! ::Rcpp::traits::equal_type<STORAGE>()(lhs, rhs);
+            return ! ::Rcpp::traits::NAEquals<STORAGE>()(lhs, rhs);
         }
 
         bool add_value(int i){

inst/include/Rcpp/sugar/functions/table.h

@@ -78,7 +78,7 @@ class Table {
     }
 
 private:
-    typedef RCPP_UNORDERED_MAP<STORAGE, int, ::Rcpp::traits::comparator_type<STORAGE> >HASH ;
+    typedef RCPP_UNORDERED_MAP<STORAGE, int, ::Rcpp::traits::NAComparator<STORAGE> >HASH ;
     typedef CountInserter<HASH,STORAGE> Inserter ;
     HASH hash ;
 };
@@ -113,7 +113,7 @@ class Table {
     typedef CountInserter<HASH,STORAGE> Inserter ;
     HASH hash ;
 
-    typedef std::map<STORAGE, int, ::Rcpp::traits::comparator_type<STORAGE> > SORTED_MAP ;
+    typedef std::map<STORAGE, int, ::Rcpp::traits::NAComparator<STORAGE> > SORTED_MAP ;
     SORTED_MAP map ;
 
 }; 

inst/include/Rcpp/traits/comparator_type.h

@@ -38,7 +38,8 @@
 #include <Rcpp/traits/storage_type.h>
 #include <Rcpp/traits/r_sexptype_traits.h>
 #include <Rcpp/traits/storage_type.h>
-#include <Rcpp/traits/comparator_type.h>
+#include <Rcpp/traits/NAComparator.h>
+#include <Rcpp/traits/NAEquals.h>
 #include <Rcpp/traits/r_type_traits.h>
 #include <Rcpp/traits/un_pointer.h>
 #include <Rcpp/traits/is_pointer.h>

inst/include/Rcpp/traits/traits.h

@@ -247,7 +247,7 @@ class Vector :
         std::sort( 
             start, 
             start + size(), 
-            typename traits::comparator_type<typename traits::storage_type<RTYPE>::type >()
+            typename traits::NAComparator<typename traits::storage_type<RTYPE>::type >()
         ) ;
         return *this ;
     }