File scpm-remove_unneeded_typedef.patch of Package scpm

Overview Repositories Revisions Requests Users Attributes Meta

File scpm-remove_unneeded_typedef.patch of Package scpm

Index: include/scpm_types.h
===================================================================
--- include/scpm_types.h.orig	2006-09-21 14:36:16.000000000 +0200
+++ include/scpm_types.h	2012-07-04 16:50:39.302484063 +0200
@@ -29,13 +29,13 @@
 #include <vector>
 #include <unistd.h>
 
-typedef enum save_mode_t {
+enum save_mode_t {
   normal,
   save_all,
   patch_all
 } ;
 
-typedef struct resource_group_t {
+struct resource_group_t {
   std::string name;
   std::string description;
   bool user_defined;
@@ -43,14 +43,14 @@ typedef struct resource_group_t {
   bool active;
 } ;
 
-typedef struct resource_entry_t {
+struct resource_entry_t {
   std::string name;
   std::string type;
   bool active;
   bool user_defined;
 } ;
 
-typedef struct resource_info_t {
+struct resource_info_t {
   std::string resource_name;
   std::string resource_type;
   bool   is_new;
@@ -60,13 +60,13 @@ typedef struct resource_info_t {
   std::vector<resource_group_t> groups;
 } ;
 
-typedef struct switch_info_t {
+struct switch_info_t {
   bool profile_modified;
   std::string profile_name;
   std::vector<resource_info_t> modified_resources;
 } ;
 
-typedef struct scpm_status_t {
+struct scpm_status_t {
   bool initialized;
   bool enabled;
   bool db_loaded;
@@ -81,14 +81,14 @@ typedef struct scpm_status_t {
   std::string db_format_version;
 } ;
 
-typedef struct backup_info_t {
+struct backup_info_t {
   std::string name;
   std::string type;
   std::string profile;
 	std::vector< std::pair<time_t, std::string> > versions;
 } ;
 
-typedef enum rebuild_mode_t {
+enum rebuild_mode_t {
   REBUILD_MODE_QUICK,
   REBUILD_MODE_RESOURCES_ONLY,
   REBUILD_MODE_DATA_ONLY,
Index: src/main/journal.hh
===================================================================
--- src/main/journal.hh.orig	2006-09-26 13:44:42.000000000 +0200
+++ src/main/journal.hh	2012-07-04 16:50:39.303484039 +0200
@@ -28,14 +28,14 @@ public:
 
 	friend class SCPM;
 
-	typedef enum status_t {
+	enum status_t {
 		STATUS_CLEAN,
 		STATUS_LOCKED,
 		STATUS_STALE_LOCK,
 		STATUS_RECOVER_NEEDED
 	} ;
 
-	typedef struct entry {
+	struct entry {
 		int command;
 		std::vector<std::string> args;
 		bool replay;
@@ -90,8 +90,8 @@ public:
 	static const int cmd_group_set_active				 = 66;
 
 		// some exceptions
-	typedef struct no_more_entries{};
-	typedef struct load_failed
+	struct no_more_entries{};
+	struct load_failed
 	{
 	public:
 		load_failed( std::string r ) { reason=r; };
Index: src/main/scpm_conf.hh
===================================================================
--- src/main/scpm_conf.hh.orig	2005-12-13 17:30:15.000000000 +0100
+++ src/main/scpm_conf.hh	2012-07-04 17:43:16.922373756 +0200
@@ -74,8 +74,8 @@ public:
 	void SetBootMode( bool value ) { boot_mode = value; };
 
 		// support for setting some options
-	typedef struct io_error{};
-	typedef struct no_such_option{};
+	struct io_error{};
+	struct no_such_option{};
 	void SaveOption( const string &option, const string &value )
 		throw( io_error, no_such_option );
 
Index: src/scdb/scdb.hh
===================================================================
--- src/scdb/scdb.hh.orig	2006-09-21 15:00:57.000000000 +0200
+++ src/scdb/scdb.hh	2012-07-04 17:43:16.922373756 +0200
@@ -38,18 +38,18 @@ public:
 	typedef XMLNode backend_node;
 	typedef LocalFile backend_file;
 
-	typedef struct dbinfo_t {
+	struct dbinfo_t {
 		string version;
 		string type;
 		bool is_local;
 	};
 
-	typedef struct resource_dep_t {
+	struct resource_dep_t {
 		string name;
 		string type;
 	};
 
-	typedef struct db_action_failed
+	struct db_action_failed
 	{
 	public:
 		db_action_failed( string r ) { reason = r; };
Index: src/scdb/scdb_util.hh
===================================================================
--- src/scdb/scdb_util.hh.orig	2005-05-11 11:03:12.000000000 +0200
+++ src/scdb/scdb_util.hh	2012-07-04 17:43:16.922373756 +0200
@@ -26,7 +26,7 @@ class SCDBUtil
 public:
 	SCDBUtil() { db = SCDB::GetHandle(); };
 
-	typedef struct operation_failed
+	struct operation_failed
 	{
 	public:
 		operation_failed( string r ) { reason = r; };
Index: src/scdb/xml.hh
===================================================================
--- src/scdb/xml.hh.orig	2005-05-11 11:03:12.000000000 +0200
+++ src/scdb/xml.hh	2012-07-04 17:43:16.922373756 +0200
@@ -54,13 +54,13 @@ public:
 	XML( );
 	~XML( );
 
-	typedef struct db_stats_t {
+	struct db_stats_t {
 		int	 node_count;
 		int	 deleted_node_count;
 		long mem_usage;
 	};
 
-	typedef struct op_failed{};
+	struct op_failed{};
 
 	XMLNode *GetRoot( ) { return root; };
 	string GetSCDBVersion( ) { return scdb_version_str; };
@@ -79,7 +79,7 @@ public:
 
 private:
 
-	typedef struct syntax_error
+	struct syntax_error
 	{
 	public:
 		syntax_error( string k, string e, unsigned int l ) 
@@ -91,9 +91,9 @@ private:
 		unsigned int line;
 	};
 
-	typedef struct end_of_tokens {};
+	struct end_of_tokens {};
 
-	typedef struct key_t {
+	struct key_t {
 		string str;
 		bool is_begin_token;
 		bool is_end_token;
Index: include/scdb.h
===================================================================
--- include/scdb.h.orig	2012-07-04 17:43:16.921373780 +0200
+++ include/scdb.h	2012-07-04 17:43:43.310738785 +0200
@@ -31,18 +31,18 @@ public:
   friend class SCDBUtil;
 
 
-  typedef struct dbinfo_t {
+  struct dbinfo_t {
     string version;
     string type;
     bool is_local;
   };
 
-  typedef struct resource_dep_t {
+  struct resource_dep_t {
     string name;
     string type;
   };
 
-  typedef struct db_action_failed
+  struct db_action_failed
   {
   public:
     db_action_failed( string r ) { reason = r; };

Places

File scpm-remove_unneeded_typedef.patch of Package scpm

Places