Skip to content

Fix for #502 #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2016
Merged

Fix for #502 #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions inst/include/Rcpp/algorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace helpers {

#ifdef RCPP_HAS_LONG_LONG_TYPES
template<>
struct ctype_helper< sizeof(CTYPE_LONG_LONG) > { typedef long long type; static const bool value = true; };
struct ctype_helper< sizeof(CTYPE_LONG_LONG) > { typedef rcpp_long_long_type type; static const bool value = true; };
#endif

template<>
Expand Down Expand Up @@ -74,7 +74,7 @@ namespace helpers {

#ifdef RCPP_HAS_LONG_LONG_TYPES
template<>
struct ctype_helper< sizeof(CTYPE_UNSIGNED_LONG_LONG) > { typedef unsigned long long type; static const bool value = true; };
struct ctype_helper< sizeof(CTYPE_UNSIGNED_LONG_LONG) > { typedef rcpp_ulong_long_type type; static const bool value = true; };
#endif


Expand All @@ -86,7 +86,7 @@ namespace helpers {
static CTYPE_INT test(const int &);
static CTYPE_LONG test(const long &);
#ifdef RCPP_HAS_LONG_LONG_TYPES
static CTYPE_LONG_LONG test(const long long &);
static CTYPE_LONG_LONG test(const rcpp_long_long_type &);
#endif
static CTYPE_FLOAT test(const float &);
static CTYPE_DOUBLE test(const double &);
Expand All @@ -97,7 +97,7 @@ namespace helpers {
static CTYPE_UNSIGNED_INT test(const unsigned int &);
static CTYPE_UNSIGNED_LONG test(const unsigned long &);
#ifdef RCPP_HAS_LONG_LONG_TYPES
static CTYPE_UNSIGNED_LONG_LONG test(const unsigned long long &);
static CTYPE_UNSIGNED_LONG_LONG test(const rcpp_ulong_long_type &);
#endif
static CTYPE_UNKNOWN test(...);

Expand All @@ -114,7 +114,7 @@ namespace helpers {
static CTYPE_INT test(const int &);
static CTYPE_LONG test(const long &);
#ifdef RCPP_HAS_LONG_LONG_TYPES
static CTYPE_LONG_LONG test(const long long &);
static CTYPE_LONG_LONG test(const rcpp_long_long_type &);
#endif
static CTYPE_FLOAT test(const float &);
static CTYPE_DOUBLE test(const double &);
Expand All @@ -125,7 +125,7 @@ namespace helpers {
static CTYPE_UNSIGNED_INT test(const unsigned int &);
static CTYPE_UNSIGNED_LONG test(const unsigned long &);
#ifdef RCPP_HAS_LONG_LONG_TYPES
static CTYPE_UNSIGNED_LONG_LONG test(const unsigned long long &);
static CTYPE_UNSIGNED_LONG_LONG test(const rcpp_ulong_long_type &);
#endif
static CTYPE_UNKNOWN test(...);

Expand Down