Skip to content

Commit

Permalink
Merge pull request #6 from MichaelChirico/include-order
Browse files Browse the repository at this point in the history
Edit #include order for system vs. R headers
  • Loading branch information
edzer authored May 24, 2023
2 parents a8078e6 + cda0683 commit bee2bf0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
7 changes: 6 additions & 1 deletion man/plot.Intervals.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use_points = TRUE,
use_names = TRUE,
names_cex = 1,
text_col = NULL,
...
)

Expand Down Expand Up @@ -84,6 +85,10 @@
TRUE}.
}

\item{text_col}{
Color of printed labels. Only relevant if \code{use_names = TRUE}.
}

\item{...}{Other arguments for \code{\link{plot.default}}.}

}
Expand Down Expand Up @@ -149,4 +154,4 @@ x <- Intervals( cbind( left, right ) )

plot(x, use_points=FALSE)
plot(x, use_points=FALSE, xlim = c(0, 500))
}
}
4 changes: 3 additions & 1 deletion src/Endpoint.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#ifndef ENDPOINT_H

#define ENDPOINT_H

#include <vector>

#include <R.h>
#include <Rinternals.h>
#include <vector>



Expand Down
6 changes: 4 additions & 2 deletions src/plot_overlap.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include <R.h>
#include <Rinternals.h>
#include "Endpoint.h"

#include <vector>
#include <set>
#include <algorithm>

#include <R.h>
#include <Rinternals.h>

/*
What we require to prevent segfaults is the same as for
interval_overlap.cpp. See details there. Everything should be checked by the
Expand Down
6 changes: 4 additions & 2 deletions src/reduce.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include <R.h>
#include <Rinternals.h>
#include "Endpoint.h"

#include <vector>
#include <algorithm>

#include <R.h>
#include <Rinternals.h>

/*
What we require to prevent segfaults is the same as for
interval_overlap.cpp. See details there. Everything should be checked by the
Expand Down
6 changes: 4 additions & 2 deletions src/which_nearest.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#include <R.h>
#include <Rinternals.h>
#include "Endpoint.h"

#include <limits>
#include <vector>
#include <set>
#include <algorithm>

#include <R.h>
#include <Rinternals.h>

/*
#### What we require to prevent segfaults:
Expand Down

0 comments on commit bee2bf0

Please sign in to comment.