[Rprotobuf-commits] r641 - pkg/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Dec 30 21:55:14 CET 2013
Author: murray
Date: 2013-12-30 21:55:14 +0100 (Mon, 30 Dec 2013)
New Revision: 641
Modified:
pkg/src/RWarningErrorCollector.h
pkg/src/S4_classes.h
pkg/src/SocketCopyingInputStream.h
Log:
whitespace change only -- clang-format
* Don't indent from the namespace {} level.
* Use consistent indentation.
* Wrap at 80chars.
Modified: pkg/src/RWarningErrorCollector.h
===================================================================
--- pkg/src/RWarningErrorCollector.h 2013-12-30 20:49:17 UTC (rev 640)
+++ pkg/src/RWarningErrorCollector.h 2013-12-30 20:55:14 UTC (rev 641)
@@ -2,13 +2,11 @@
namespace rprotobuf {
- class RWarningErrorCollector : public GPB::compiler::MultiFileErrorCollector {
- public:
-
- // implements ErrorCollector ---------------------------------------
- void AddError(const std::string& filename, int line, int column,
- const std::string& message) ;
-
-} ;
+class RWarningErrorCollector : public GPB::compiler::MultiFileErrorCollector {
+ public:
+ // implements ErrorCollector ---------------------------------------
+ void AddError(const std::string& filename, int line, int column,
+ const std::string& message);
+};
-} // namespace rprotobuf
+} // namespace rprotobuf
Modified: pkg/src/S4_classes.h
===================================================================
--- pkg/src/S4_classes.h 2013-12-30 20:49:17 UTC (rev 640)
+++ pkg/src/S4_classes.h 2013-12-30 20:55:14 UTC (rev 641)
@@ -24,210 +24,204 @@
namespace rprotobuf {
- class S4_EnumValueDescriptor : public Rcpp::S4 {
- public:
- S4_EnumValueDescriptor( const GPB::EnumValueDescriptor* d) : S4("EnumValueDescriptor"){
-
- if( d ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::EnumValueDescriptor>(
- const_cast<GPB::EnumValueDescriptor*>(d), false) ;
- slot( "name" ) = d->name() ;
- slot( "full_name") = d->full_name() ;
- } else{
- setSEXP( R_NilValue );
- }
- }
-
- S4_EnumValueDescriptor( const S4_EnumValueDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_EnumValueDescriptor& operator=( const S4_EnumValueDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
-
- } ;
-
-
- class S4_Descriptor : public Rcpp::S4 {
- public:
- S4_Descriptor( const GPB::Descriptor* d) : S4( "Descriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::Descriptor>(
- const_cast<GPB::Descriptor*>(d), false) ;
- if (!d) {
- slot( "type" ) = Rcpp::StringVector(0) ;
- } else {
- slot( "type" ) = d->full_name() ;
- }
- }
-
- S4_Descriptor( const S4_Descriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_Descriptor& operator=( const S4_Descriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
-
- class S4_FileDescriptor : public Rcpp::S4 {
- public:
- S4_FileDescriptor( const GPB::FileDescriptor* d) : S4( "FileDescriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::FileDescriptor>(
- const_cast<GPB::FileDescriptor*>(d), false) ;
- if (!d) {
- slot ( "package" ) = Rcpp::StringVector(0);
- slot ( "filename" ) = Rcpp::StringVector(0);
- } else {
- slot ( "package" ) = d->package();
- slot ( "filename" ) = d->name();
- }
- }
-
- S4_FileDescriptor( const S4_FileDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_FileDescriptor& operator=( const S4_FileDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
-
-
- class S4_FieldDescriptor : public Rcpp::S4 {
- public:
- S4_FieldDescriptor( const GPB::FieldDescriptor* d) : S4( "FieldDescriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::FieldDescriptor>(
- const_cast<GPB::FieldDescriptor*>(d), false) ;
- slot( "name" ) = d->name() ;
- slot( "full_name" ) = d->full_name() ;
- slot( "type" ) = d->containing_type()->full_name() ;
- }
-
- S4_FieldDescriptor( const S4_FieldDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_FieldDescriptor& operator=( const S4_FieldDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
-
+class S4_EnumValueDescriptor : public Rcpp::S4 {
+ public:
+ S4_EnumValueDescriptor(const GPB::EnumValueDescriptor* d)
+ : S4("EnumValueDescriptor") {
- class S4_ServiceDescriptor : public Rcpp::S4 {
- public:
- S4_ServiceDescriptor( const GPB::ServiceDescriptor* d) : S4( "ServiceDescriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::ServiceDescriptor>(
- const_cast<GPB::ServiceDescriptor*>(d), false) ;
- }
-
- S4_ServiceDescriptor( const S4_ServiceDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_ServiceDescriptor& operator=( const S4_ServiceDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
-
- class S4_MethodDescriptor : public Rcpp::S4 {
- public:
- S4_MethodDescriptor( const GPB::MethodDescriptor* d) : S4( "MethodDescriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::MethodDescriptor>(
- const_cast<GPB::MethodDescriptor*>(d), false) ;
- }
-
- S4_MethodDescriptor( const S4_MethodDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_MethodDescriptor& operator=( const S4_MethodDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
-
- class S4_EnumDescriptor : public Rcpp::S4 {
- public:
- S4_EnumDescriptor( const GPB::EnumDescriptor* d) : S4( "EnumDescriptor" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::EnumDescriptor>(
- const_cast<GPB::EnumDescriptor*>(d), false) ;
- slot( "type" ) = Rcpp::StringVector(0) ;
- if (d) {
- slot( "name" ) = d->name() ;
- slot( "full_name") = d->full_name() ;
- const GPB::Descriptor *type_desc = d->containing_type() ;
- if( type_desc ){
- slot( "type" ) = type_desc->full_name() ;
- }
- } else {
- slot( "name" ) = Rcpp::StringVector(0) ;
- slot( "full_name") = Rcpp::StringVector(0) ;
- }
- }
-
- S4_EnumDescriptor( const S4_EnumDescriptor& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_EnumDescriptor& operator=( const S4_EnumDescriptor& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
+ if (d) {
+ slot("pointer") = Rcpp::XPtr<GPB::EnumValueDescriptor>(
+ const_cast<GPB::EnumValueDescriptor*>(d), false);
+ slot("name") = d->name();
+ slot("full_name") = d->full_name();
+ } else {
+ setSEXP(R_NilValue);
+ }
+ }
- class S4_Message : public Rcpp::S4 {
- public:
- S4_Message( const GPB::Message* d) : S4( "Message" ){
- slot( "pointer" ) = Rcpp::XPtr<GPB::Message>(
- const_cast<GPB::Message*>(d), true) ;
- slot( "type" ) = d->GetDescriptor()->full_name() ;
- }
- S4_Message( const S4_Message& other) : S4(){
- setSEXP( other.asSexp() );
- }
- S4_Message& operator=( const S4_Message& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
- } ;
+ S4_EnumValueDescriptor(const S4_EnumValueDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_EnumValueDescriptor& operator=(const S4_EnumValueDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
- class S4_ArrayOutputStream : public Rcpp::S4 {
-
- public:
- S4_ArrayOutputStream( int size, int block_size ) : S4( "ArrayOutputStream" ) {
-
- Rcpp::RawVector payload(size) ;
- GPB::io::ArrayOutputStream* stream =
- new GPB::io::ArrayOutputStream( payload.begin(), size, block_size ) ;
-
- Rcpp::XPtr<ZeroCopyOutputStreamWrapper> wrapper(
- new ZeroCopyOutputStreamWrapper(stream), true, R_NilValue, payload ) ;
- slot( "pointer" ) = wrapper ;
- }
-
- S4_ArrayOutputStream( const S4_ArrayOutputStream& other ){
- setSEXP( other.asSexp() );
- }
- S4_ArrayOutputStream& operator=( const S4_ArrayOutputStream& other){
- setSEXP( other.asSexp() );
- return *this ;
- }
-
- } ;
-
- class S4_ArrayInputStream : public Rcpp::S4 {
- public:
- S4_ArrayInputStream( Rcpp::RawVector payload, int block_size ) : S4( "ArrayInputStream" ){
- GPB::io::ArrayInputStream* stream =
- new GPB::io::ArrayInputStream( payload.begin(), payload.size() , block_size ) ;
- Rcpp::XPtr<rprotobuf::ZeroCopyInputStreamWrapper> wrapper(
- new ZeroCopyInputStreamWrapper(stream), true, R_NilValue, payload ) ;
- slot("pointer") = wrapper ;
- }
- } ;
-
-
-
-} // namespace rprotobuf
+class S4_Descriptor : public Rcpp::S4 {
+ public:
+ S4_Descriptor(const GPB::Descriptor* d) : S4("Descriptor") {
+ slot("pointer") =
+ Rcpp::XPtr<GPB::Descriptor>(const_cast<GPB::Descriptor*>(d), false);
+ if (!d) {
+ slot("type") = Rcpp::StringVector(0);
+ } else {
+ slot("type") = d->full_name();
+ }
+ }
+ S4_Descriptor(const S4_Descriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_Descriptor& operator=(const S4_Descriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+class S4_FileDescriptor : public Rcpp::S4 {
+ public:
+ S4_FileDescriptor(const GPB::FileDescriptor* d) : S4("FileDescriptor") {
+ slot("pointer") = Rcpp::XPtr<GPB::FileDescriptor>(
+ const_cast<GPB::FileDescriptor*>(d), false);
+ if (!d) {
+ slot("package") = Rcpp::StringVector(0);
+ slot("filename") = Rcpp::StringVector(0);
+ } else {
+ slot("package") = d->package();
+ slot("filename") = d->name();
+ }
+ }
+
+ S4_FileDescriptor(const S4_FileDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_FileDescriptor& operator=(const S4_FileDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_FieldDescriptor : public Rcpp::S4 {
+ public:
+ S4_FieldDescriptor(const GPB::FieldDescriptor* d) : S4("FieldDescriptor") {
+ slot("pointer") = Rcpp::XPtr<GPB::FieldDescriptor>(
+ const_cast<GPB::FieldDescriptor*>(d), false);
+ slot("name") = d->name();
+ slot("full_name") = d->full_name();
+ slot("type") = d->containing_type()->full_name();
+ }
+
+ S4_FieldDescriptor(const S4_FieldDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_FieldDescriptor& operator=(const S4_FieldDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_ServiceDescriptor : public Rcpp::S4 {
+ public:
+ S4_ServiceDescriptor(const GPB::ServiceDescriptor* d)
+ : S4("ServiceDescriptor") {
+ slot("pointer") = Rcpp::XPtr<GPB::ServiceDescriptor>(
+ const_cast<GPB::ServiceDescriptor*>(d), false);
+ }
+
+ S4_ServiceDescriptor(const S4_ServiceDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_ServiceDescriptor& operator=(const S4_ServiceDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_MethodDescriptor : public Rcpp::S4 {
+ public:
+ S4_MethodDescriptor(const GPB::MethodDescriptor* d)
+ : S4("MethodDescriptor") {
+ slot("pointer") = Rcpp::XPtr<GPB::MethodDescriptor>(
+ const_cast<GPB::MethodDescriptor*>(d), false);
+ }
+
+ S4_MethodDescriptor(const S4_MethodDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_MethodDescriptor& operator=(const S4_MethodDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_EnumDescriptor : public Rcpp::S4 {
+ public:
+ S4_EnumDescriptor(const GPB::EnumDescriptor* d) : S4("EnumDescriptor") {
+ slot("pointer") = Rcpp::XPtr<GPB::EnumDescriptor>(
+ const_cast<GPB::EnumDescriptor*>(d), false);
+ slot("type") = Rcpp::StringVector(0);
+ if (d) {
+ slot("name") = d->name();
+ slot("full_name") = d->full_name();
+ const GPB::Descriptor* type_desc = d->containing_type();
+ if (type_desc) {
+ slot("type") = type_desc->full_name();
+ }
+ } else {
+ slot("name") = Rcpp::StringVector(0);
+ slot("full_name") = Rcpp::StringVector(0);
+ }
+ }
+
+ S4_EnumDescriptor(const S4_EnumDescriptor& other) : S4() {
+ setSEXP(other.asSexp());
+ }
+ S4_EnumDescriptor& operator=(const S4_EnumDescriptor& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_Message : public Rcpp::S4 {
+ public:
+ S4_Message(const GPB::Message* d) : S4("Message") {
+ slot("pointer") =
+ Rcpp::XPtr<GPB::Message>(const_cast<GPB::Message*>(d), true);
+ slot("type") = d->GetDescriptor()->full_name();
+ }
+ S4_Message(const S4_Message& other) : S4() { setSEXP(other.asSexp()); }
+ S4_Message& operator=(const S4_Message& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_ArrayOutputStream : public Rcpp::S4 {
+
+ public:
+ S4_ArrayOutputStream(int size, int block_size) : S4("ArrayOutputStream") {
+
+ Rcpp::RawVector payload(size);
+ GPB::io::ArrayOutputStream* stream =
+ new GPB::io::ArrayOutputStream(payload.begin(), size, block_size);
+
+ Rcpp::XPtr<ZeroCopyOutputStreamWrapper> wrapper(
+ new ZeroCopyOutputStreamWrapper(stream), true, R_NilValue, payload);
+ slot("pointer") = wrapper;
+ }
+
+ S4_ArrayOutputStream(const S4_ArrayOutputStream& other) {
+ setSEXP(other.asSexp());
+ }
+ S4_ArrayOutputStream& operator=(const S4_ArrayOutputStream& other) {
+ setSEXP(other.asSexp());
+ return *this;
+ }
+};
+
+class S4_ArrayInputStream : public Rcpp::S4 {
+ public:
+ S4_ArrayInputStream(Rcpp::RawVector payload, int block_size)
+ : S4("ArrayInputStream") {
+ GPB::io::ArrayInputStream* stream = new GPB::io::ArrayInputStream(
+ payload.begin(), payload.size(), block_size);
+ Rcpp::XPtr<rprotobuf::ZeroCopyInputStreamWrapper> wrapper(
+ new ZeroCopyInputStreamWrapper(stream), true, R_NilValue, payload);
+ slot("pointer") = wrapper;
+ }
+};
+
+} // namespace rprotobuf
+
#endif
Modified: pkg/src/SocketCopyingInputStream.h
===================================================================
--- pkg/src/SocketCopyingInputStream.h 2013-12-30 20:49:17 UTC (rev 640)
+++ pkg/src/SocketCopyingInputStream.h 2013-12-30 20:55:14 UTC (rev 641)
@@ -10,19 +10,18 @@
we need it for the TCP_NODELAY socket option */
#include <netinet/tcp.h>
-namespace rprotobuf{
+namespace rprotobuf {
- class SocketCopyingInputStream : public GPB::io::CopyingInputStream {
- public:
- SocketCopyingInputStream( int socket_id );
-
- int Read(void * buffer, int size) ;
-
- private:
- int socket_id ;
-
-} ;
+class SocketCopyingInputStream : public GPB::io::CopyingInputStream {
+ public:
+ SocketCopyingInputStream(int socket_id);
-} // namespace rprotobuf
+ int Read(void* buffer, int size);
+ private:
+ int socket_id;
+};
+
+} // namespace rprotobuf
+
#endif
More information about the Rprotobuf-commits
mailing list