Merge pull request #548 from dirmeier/master

eddelbuettel · web-flow · commit b8bb34795719 · 2016-09-02T13:34:50.000-05:00
Remove leading underscore from header guard methods.
diff --git a/Rcpp b/Rcpp
@@ -0,0 +1 @@
+Subproject commit 56a89c184a581d44d211df7b831591e157d26bd9
diff --git a/src/attributes.cpp b/src/attributes.cpp
@@ -2149,7 +2149,7 @@ namespace attributes {
     }
 
     std::string CppExportsIncludeGenerator::getHeaderGuard() const {
-        return "_RCPP_" + packageCpp() + "_RCPPEXPORTS_H_GEN_";
+        return "RCPP_" + packageCpp() + "_RCPPEXPORTS_H_GEN_";
     }
 
     CppPackageIncludeGenerator::CppPackageIncludeGenerator(
@@ -2197,7 +2197,7 @@ namespace attributes {
     }
 
     std::string CppPackageIncludeGenerator::getHeaderGuard() const {
-        return "_RCPP_" + packageCpp() + "_H_GEN_";
+        return "RCPP_" + packageCpp() + "_H_GEN_";
     }
 
     RExportsGenerator::RExportsGenerator(const std::string& packageDir,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 56a89c184a581d44d211df7b831591e157d26bd9`
Original file line number	Diff line number	Diff line change
`@@ -2149,7 +2149,7 @@ namespace attributes {`
`2149`	`2149`	`}`
`2150`	`2150`
`2151`	`2151`	`std::string CppExportsIncludeGenerator::getHeaderGuard() const {`
`2152`		`- return "_RCPP_" + packageCpp() + "_RCPPEXPORTS_H_GEN_";`
	`2152`	`+ return "RCPP_" + packageCpp() + "_RCPPEXPORTS_H_GEN_";`
`2153`	`2153`	`}`
`2154`	`2154`
`2155`	`2155`	`CppPackageIncludeGenerator::CppPackageIncludeGenerator(`
`@@ -2197,7 +2197,7 @@ namespace attributes {`
`2197`	`2197`	`}`
`2198`	`2198`
`2199`	`2199`	`std::string CppPackageIncludeGenerator::getHeaderGuard() const {`
`2200`		`- return "_RCPP_" + packageCpp() + "_H_GEN_";`
	`2200`	`+ return "RCPP_" + packageCpp() + "_H_GEN_";`
`2201`	`2201`	`}`
`2202`	`2202`
`2203`	`2203`	`RExportsGenerator::RExportsGenerator(const std::string& packageDir,`