[Rprotobuf-commits] r640 - pkg/src

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

Author: murray
Date: 2013-12-30 21:49:17 +0100 (Mon, 30 Dec 2013)
New Revision: 640

Modified:
   pkg/src/DescriptorPoolLookup.h
   pkg/src/connections.h
   pkg/src/fieldtypes.h
Log:
whitespace change only. clang-format.



Modified: pkg/src/DescriptorPoolLookup.h
===================================================================
--- pkg/src/DescriptorPoolLookup.h	2013-12-30 20:42:32 UTC (rev 639)
+++ pkg/src/DescriptorPoolLookup.h	2013-12-30 20:49:17 UTC (rev 640)
@@ -4,31 +4,30 @@
 #include "RSourceTree.h"
 #include "RWarningErrorCollector.h"
 
-namespace rprotobuf{
+namespace rprotobuf {
 
-	class DescriptorPoolLookup {
-		public:
-			static void add( const std::string& element) ;
-			
-			static bool contains( const std::string& element) ; 
-		
-			static SEXP getElements() ;
-		
-			static void importProtoFiles( SEXP files, SEXP cwd ) ;
-			
-			static const GPB::DescriptorPool* pool() ;
-			
-			static const GPB::DynamicMessageFactory* factory() ;
-			
-		private:	
-			
-			static std::set<std::string> elements ;
-			static RWarningErrorCollector error_collector ;
-			static RSourceTree source_tree ;
-			static GPB::compiler::Importer importer ;
-			static GPB::DynamicMessageFactory message_factory ;
-} ;
+class DescriptorPoolLookup {
+   public:
+    static void add(const std::string& element);
 
-} // namespace rprotobuf
+    static bool contains(const std::string& element);
 
+    static SEXP getElements();
+
+    static void importProtoFiles(SEXP files, SEXP cwd);
+
+    static const GPB::DescriptorPool* pool();
+
+    static const GPB::DynamicMessageFactory* factory();
+
+   private:
+    static std::set<std::string> elements;
+    static RWarningErrorCollector error_collector;
+    static RSourceTree source_tree;
+    static GPB::compiler::Importer importer;
+    static GPB::DynamicMessageFactory message_factory;
+};
+
+}  // namespace rprotobuf
+
 #endif

Modified: pkg/src/connections.h
===================================================================
--- pkg/src/connections.h	2013-12-30 20:42:32 UTC (rev 639)
+++ pkg/src/connections.h	2013-12-30 20:49:17 UTC (rev 640)
@@ -5,12 +5,11 @@
 // struct Rconn {
 //     char* class;
 //     char mode[5];
-//     Rboolean text, isopen, incomplete, canread, canwrite, canseek, blocking, isGzcon;
+//     Rboolean text, isopen, incomplete, canread, canwrite, canseek, blocking,
+//       isGzcon;
 //     int (*fgetc)(struct Rconn *);
 //     size_t (*read)(void *, size_t, size_t, struct Rconn *);
 //     size_t (*write)(const void *, size_t, size_t, struct Rconn *);
 // };
 
-
-
 #endif

Modified: pkg/src/fieldtypes.h
===================================================================
--- pkg/src/fieldtypes.h	2013-12-30 20:42:32 UTC (rev 639)
+++ pkg/src/fieldtypes.h	2013-12-30 20:49:17 UTC (rev 640)
@@ -1,39 +1,38 @@
 #ifndef FIELD_TYPES_H
 #define FIELD_TYPES_H
 
-using namespace google::protobuf ;
+using namespace google::protobuf;
 
-#define TYPE_DOUBLE   FieldDescriptor::TYPE_DOUBLE  
-#define TYPE_FLOAT    FieldDescriptor::TYPE_FLOAT   
-#define TYPE_INT64    FieldDescriptor::TYPE_INT64   
-#define TYPE_UINT64   FieldDescriptor::TYPE_UINT64  
-#define TYPE_INT32    FieldDescriptor::TYPE_INT32   
-#define TYPE_FIXED64  FieldDescriptor::TYPE_FIXED64 
-#define TYPE_FIXED32  FieldDescriptor::TYPE_FIXED32 
-#define TYPE_BOOL     FieldDescriptor::TYPE_BOOL    
-#define TYPE_STRING   FieldDescriptor::TYPE_STRING  
-#define TYPE_GROUP    FieldDescriptor::TYPE_GROUP   
-#define TYPE_MESSAGE  FieldDescriptor::TYPE_MESSAGE 
-#define TYPE_BYTES    FieldDescriptor::TYPE_BYTES   
-#define TYPE_UINT32   FieldDescriptor::TYPE_UINT32  
-#define TYPE_ENUM     FieldDescriptor::TYPE_ENUM    
+#define TYPE_DOUBLE FieldDescriptor::TYPE_DOUBLE
+#define TYPE_FLOAT FieldDescriptor::TYPE_FLOAT
+#define TYPE_INT64 FieldDescriptor::TYPE_INT64
+#define TYPE_UINT64 FieldDescriptor::TYPE_UINT64
+#define TYPE_INT32 FieldDescriptor::TYPE_INT32
+#define TYPE_FIXED64 FieldDescriptor::TYPE_FIXED64
+#define TYPE_FIXED32 FieldDescriptor::TYPE_FIXED32
+#define TYPE_BOOL FieldDescriptor::TYPE_BOOL
+#define TYPE_STRING FieldDescriptor::TYPE_STRING
+#define TYPE_GROUP FieldDescriptor::TYPE_GROUP
+#define TYPE_MESSAGE FieldDescriptor::TYPE_MESSAGE
+#define TYPE_BYTES FieldDescriptor::TYPE_BYTES
+#define TYPE_UINT32 FieldDescriptor::TYPE_UINT32
+#define TYPE_ENUM FieldDescriptor::TYPE_ENUM
 #define TYPE_SFIXED32 FieldDescriptor::TYPE_SFIXED32
 #define TYPE_SFIXED64 FieldDescriptor::TYPE_SFIXED64
-#define TYPE_SINT32   FieldDescriptor::TYPE_SINT32  
-#define TYPE_SINT64   FieldDescriptor::TYPE_SINT64  
-#define MAX_TYPE      FieldDescriptor::MAX_TYPE     
+#define TYPE_SINT32 FieldDescriptor::TYPE_SINT32
+#define TYPE_SINT64 FieldDescriptor::TYPE_SINT64
+#define MAX_TYPE FieldDescriptor::MAX_TYPE
 
-#define CPPTYPE_INT32   FieldDescriptor::CPPTYPE_INT32  
-#define CPPTYPE_INT64   FieldDescriptor::CPPTYPE_INT64  
-#define CPPTYPE_UINT32  FieldDescriptor::CPPTYPE_UINT32 
-#define CPPTYPE_UINT64  FieldDescriptor::CPPTYPE_UINT64 
-#define CPPTYPE_DOUBLE  FieldDescriptor::CPPTYPE_DOUBLE 
-#define CPPTYPE_FLOAT   FieldDescriptor::CPPTYPE_FLOAT  
-#define CPPTYPE_BOOL    FieldDescriptor::CPPTYPE_BOOL   
-#define CPPTYPE_ENUM    FieldDescriptor::CPPTYPE_ENUM   
-#define CPPTYPE_STRING  FieldDescriptor::CPPTYPE_STRING 
+#define CPPTYPE_INT32 FieldDescriptor::CPPTYPE_INT32
+#define CPPTYPE_INT64 FieldDescriptor::CPPTYPE_INT64
+#define CPPTYPE_UINT32 FieldDescriptor::CPPTYPE_UINT32
+#define CPPTYPE_UINT64 FieldDescriptor::CPPTYPE_UINT64
+#define CPPTYPE_DOUBLE FieldDescriptor::CPPTYPE_DOUBLE
+#define CPPTYPE_FLOAT FieldDescriptor::CPPTYPE_FLOAT
+#define CPPTYPE_BOOL FieldDescriptor::CPPTYPE_BOOL
+#define CPPTYPE_ENUM FieldDescriptor::CPPTYPE_ENUM
+#define CPPTYPE_STRING FieldDescriptor::CPPTYPE_STRING
 #define CPPTYPE_MESSAGE FieldDescriptor::CPPTYPE_MESSAGE
-#define MAX_CPPTYPE     FieldDescriptor::MAX_CPPTYPE    
+#define MAX_CPPTYPE FieldDescriptor::MAX_CPPTYPE
 
-
 #endif