[Rcpp-commits] r4156 - in pkg/Rcpp: . src

[noreply at r-forge.r-project.org]

Author: jjallaire
Date: 2012-12-14 00:34:22 +0100 (Fri, 14 Dec 2012)
New Revision: 4156

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/attributes.cpp
Log:
don't declare attributes constant strings extern

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-12-13 18:06:07 UTC (rev 4155)
+++ pkg/Rcpp/ChangeLog	2012-12-13 23:34:22 UTC (rev 4156)
@@ -2,7 +2,8 @@
 
         * src/Attributes.R: always generate new dynlib file for rebuild=TRUE
         * src/attributes.cpp: set svn:eol-style to native; always generate 
-        new dynlib file for rebuild=TRUE
+        new dynlib file for rebuild=TRUE; don't declare attributes constant
+        strings extern
 
 2012-12-12 Romain Francois <romain at r-enthusiasts.com>
 

Modified: pkg/Rcpp/src/attributes.cpp
===================================================================
--- pkg/Rcpp/src/attributes.cpp	2012-12-13 18:06:07 UTC (rev 4155)
+++ pkg/Rcpp/src/attributes.cpp	2012-12-13 23:34:22 UTC (rev 4156)
@@ -94,11 +94,11 @@
 namespace attributes {
      
     // Known attribute names & parameters
-    extern const char * const kExportAttribute;
-    extern const char * const kDependsAttribute;
-    extern const char * const kInterfacesAttribute;
-    extern const char * const kInterfaceR;
-    extern const char * const kInterfaceCpp; 
+    const char * const kExportAttribute = "export";
+    const char * const kDependsAttribute = "depends";
+    const char * const kInterfacesAttribute = "interfaces";
+    const char * const kInterfaceR = "r";
+    const char * const kInterfaceCpp = "cpp";
      
     // Type info
     class Type {
@@ -777,13 +777,6 @@
         }
         return os;
     }
-    
-    // Known attribute names
-    const char * const kExportAttribute = "export";
-    const char * const kDependsAttribute = "depends";
-    const char * const kInterfacesAttribute = "interfaces";
-    const char * const kInterfaceR = "r";
-    const char * const kInterfaceCpp = "cpp";
       
     // Parse the attributes from a source file
     SourceFileAttributesParser::SourceFileAttributesParser