Increase the visibility of sugar functions

kevinushey · kevinushey · commit fc20cfc2766e · 2014-03-17T03:11:16.000-07:00
diff --git a/inst/include/Rcpp/sugar/operators/divides.h b/inst/include/Rcpp/sugar/operators/divides.h
@@ -406,43 +406,44 @@ namespace sugar{
 	} ;
 
 
-}
 }
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Divides_Vector_Primitive< RTYPE , NA, T >
+inline sugar::Divides_Vector_Primitive< RTYPE , NA, T >
 operator/( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename traits::storage_type<RTYPE>::type rhs 
 ) {
-	return Rcpp::sugar::Divides_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Divides_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Divides_Primitive_Vector< RTYPE , NA,T>
+inline sugar::Divides_Primitive_Vector< RTYPE , NA,T>
 operator/( 
-	typename Rcpp::traits::storage_type<RTYPE>::type lhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& rhs
+	typename traits::storage_type<RTYPE>::type lhs, 
+	const VectorBase<RTYPE,NA,T>& rhs
 ) {
-	return Rcpp::sugar::Divides_Primitive_Vector<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Divides_Primitive_Vector<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 template <int RTYPE,bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-inline Rcpp::sugar::Divides_Vector_Vector< 
+inline sugar::Divides_Vector_Vector< 
 	RTYPE , 
 	LHS_NA, LHS_T, 
 	RHS_NA, RHS_T
 	>
 operator/( 
-	const Rcpp::VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
-	const Rcpp::VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
+	const VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
+	const VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
 ) {
-	return Rcpp::sugar::Divides_Vector_Vector<
+	return sugar::Divides_Vector_Vector<
 		RTYPE, 
 		LHS_NA,LHS_T,
 		RHS_NA,RHS_T
 		>( lhs, rhs ) ;
 }
 
+}
+
 #endif
diff --git a/inst/include/Rcpp/sugar/operators/minus.h b/inst/include/Rcpp/sugar/operators/minus.h
@@ -410,43 +410,44 @@ namespace sugar{
 	} ;
 
 
-}
 }
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Minus_Vector_Primitive< RTYPE , NA, T >
+inline sugar::Minus_Vector_Primitive< RTYPE , NA, T >
 operator-( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename traits::storage_type<RTYPE>::type rhs 
 ) {
-	return Rcpp::sugar::Minus_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Minus_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Minus_Primitive_Vector< RTYPE , NA,T>
+inline sugar::Minus_Primitive_Vector< RTYPE , NA,T>
 operator-( 
-	typename Rcpp::traits::storage_type<RTYPE>::type lhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& rhs
+	typename traits::storage_type<RTYPE>::type lhs, 
+	const VectorBase<RTYPE,NA,T>& rhs
 ) {
-	return Rcpp::sugar::Minus_Primitive_Vector<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Minus_Primitive_Vector<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 template <int RTYPE,bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-inline Rcpp::sugar::Minus_Vector_Vector< 
+inline sugar::Minus_Vector_Vector< 
 	RTYPE , 
 	LHS_NA, LHS_T, 
 	RHS_NA, RHS_T
 	>
 operator-( 
-	const Rcpp::VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
-	const Rcpp::VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
+	const VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
+	const VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
 ) {
-	return Rcpp::sugar::Minus_Vector_Vector<
+	return sugar::Minus_Vector_Vector<
 		RTYPE, 
 		LHS_NA,LHS_T,
 		RHS_NA,RHS_T
 		>( lhs, rhs ) ;
 }
 
+}
+
 #endif
diff --git a/inst/include/Rcpp/sugar/operators/plus.h b/inst/include/Rcpp/sugar/operators/plus.h
@@ -441,63 +441,64 @@ namespace sugar{
 	} ;
 	
 }
-}
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Plus_Vector_Primitive<RTYPE,NA,T>
+inline sugar::Plus_Vector_Primitive<RTYPE,NA,T>
 operator+( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename traits::storage_type<RTYPE>::type rhs 
 ) {
-	return Rcpp::sugar::Plus_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Plus_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Plus_Vector_Primitive< RTYPE , NA , T >
+inline sugar::Plus_Vector_Primitive< RTYPE , NA , T >
 operator+( 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs
+	typename traits::storage_type<RTYPE>::type rhs, 
+	const VectorBase<RTYPE,NA,T>& lhs
 ) {
-	return Rcpp::sugar::Plus_Vector_Primitive<RTYPE,NA, T >( lhs, rhs ) ;
+	return sugar::Plus_Vector_Primitive<RTYPE,NA, T >( lhs, rhs ) ;
 }
 
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Plus_Vector_Primitive_nona<RTYPE,NA,T>
+inline sugar::Plus_Vector_Primitive_nona<RTYPE,NA,T>
 operator+( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::sugar::NonaPrimitive< typename Rcpp::traits::storage_type<RTYPE>::type > rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename sugar::NonaPrimitive< typename traits::storage_type<RTYPE>::type > rhs 
 ) {
-	return Rcpp::sugar::Plus_Vector_Primitive_nona<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Plus_Vector_Primitive_nona<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Plus_Vector_Primitive_nona< RTYPE , NA , T >
+inline sugar::Plus_Vector_Primitive_nona< RTYPE , NA , T >
 operator+( 
-	typename Rcpp::sugar::NonaPrimitive< typename Rcpp::traits::storage_type<RTYPE>::type > rhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs
+	typename sugar::NonaPrimitive< typename traits::storage_type<RTYPE>::type > rhs, 
+	const VectorBase<RTYPE,NA,T>& lhs
 ) {
-	return Rcpp::sugar::Plus_Vector_Primitive_nona<RTYPE,NA, T >( lhs, rhs ) ;
+	return sugar::Plus_Vector_Primitive_nona<RTYPE,NA, T >( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-inline Rcpp::sugar::Plus_Vector_Vector< 
+inline sugar::Plus_Vector_Vector< 
 	RTYPE , 
 	LHS_NA, LHS_T, 
 	RHS_NA, RHS_T
 	>
 operator+( 
-	const Rcpp::VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
-	const Rcpp::VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
+	const VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
+	const VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
 ) {
-	return Rcpp::sugar::Plus_Vector_Vector<
+	return sugar::Plus_Vector_Vector<
 		RTYPE, 
 		LHS_NA, LHS_T,
 		RHS_NA, RHS_T
 		>( lhs, rhs ) ;
 }
 
+}
+
 #endif
diff --git a/inst/include/Rcpp/sugar/operators/times.h b/inst/include/Rcpp/sugar/operators/times.h
@@ -423,63 +423,64 @@ namespace sugar{
 	} ;
 	
 }
-}
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Times_Vector_Primitive<RTYPE,NA,T>
+inline sugar::Times_Vector_Primitive<RTYPE,NA,T>
 operator*( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename traits::storage_type<RTYPE>::type rhs 
 ) {
-	return Rcpp::sugar::Times_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Times_Vector_Primitive<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Times_Vector_Primitive< RTYPE , NA , T >
+inline sugar::Times_Vector_Primitive< RTYPE , NA , T >
 operator*( 
-	typename Rcpp::traits::storage_type<RTYPE>::type rhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs
+	typename traits::storage_type<RTYPE>::type rhs, 
+	const VectorBase<RTYPE,NA,T>& lhs
 ) {
-	return Rcpp::sugar::Times_Vector_Primitive<RTYPE,NA, T >( lhs, rhs ) ;
+	return sugar::Times_Vector_Primitive<RTYPE,NA, T >( lhs, rhs ) ;
 }
 
 
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Times_Vector_Primitive_nona<RTYPE,NA,T>
+inline sugar::Times_Vector_Primitive_nona<RTYPE,NA,T>
 operator*( 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs, 
-	typename Rcpp::sugar::NonaPrimitive< typename Rcpp::traits::storage_type<RTYPE>::type > rhs 
+	const VectorBase<RTYPE,NA,T>& lhs, 
+	typename sugar::NonaPrimitive< typename traits::storage_type<RTYPE>::type > rhs 
 ) {
-	return Rcpp::sugar::Times_Vector_Primitive_nona<RTYPE,NA,T>( lhs, rhs ) ;
+	return sugar::Times_Vector_Primitive_nona<RTYPE,NA,T>( lhs, rhs ) ;
 }
 
 template <int RTYPE,bool NA, typename T>
-inline Rcpp::sugar::Times_Vector_Primitive_nona< RTYPE , NA , T >
+inline sugar::Times_Vector_Primitive_nona< RTYPE , NA , T >
 operator*( 
-	typename Rcpp::sugar::NonaPrimitive< typename Rcpp::traits::storage_type<RTYPE>::type > rhs, 
-	const Rcpp::VectorBase<RTYPE,NA,T>& lhs
+	typename sugar::NonaPrimitive< typename traits::storage_type<RTYPE>::type > rhs, 
+	const VectorBase<RTYPE,NA,T>& lhs
 ) {
-	return Rcpp::sugar::Times_Vector_Primitive_nona<RTYPE,NA, T >( lhs, rhs ) ;
+	return sugar::Times_Vector_Primitive_nona<RTYPE,NA, T >( lhs, rhs ) ;
 }
 
 
 template <int RTYPE,bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-inline Rcpp::sugar::Times_Vector_Vector< 
+inline sugar::Times_Vector_Vector< 
 	RTYPE , 
 	LHS_NA, LHS_T, 
 	RHS_NA, RHS_T
 	>
 operator*( 
-	const Rcpp::VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
-	const Rcpp::VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
+	const VectorBase<RTYPE,LHS_NA,LHS_T>& lhs,
+	const VectorBase<RTYPE,RHS_NA,RHS_T>& rhs
 ) {
-	return Rcpp::sugar::Times_Vector_Vector<
+	return sugar::Times_Vector_Vector<
 		RTYPE, 
 		LHS_NA, LHS_T,
 		RHS_NA, RHS_T
 		>( lhs, rhs ) ;
 }
 
+}
+
 #endif
