massive name conflict resolution

git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 7 insertions, 7 deletions

diff --git a/protocols/AimOscar/src/snac.h b/protocols/AimOscar/src/snac.h
index 8c184dfa3e..5c97462f22 100644
--- a/protocols/AimOscar/src/snac.h
+++ b/protocols/AimOscar/src/snac.h
@@ -23,23 +23,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 class SNAC

 {

-private:

 	unsigned short service_;

 	unsigned short subgroup_;

 	unsigned short length_;

 	unsigned short flags_;

 	unsigned short idh_;

 	unsigned short id_;

-	char* value_;

+	char *value_;

+

 public:

-	SNAC(char* buf, unsigned short length);

+	SNAC(char *buf, unsigned short length);

 	int cmp(unsigned short service);

 	int subcmp(unsigned short subgroup);

-	unsigned short ushort(int pos=0);

-	unsigned long ulong(int pos=0);

-	unsigned char ubyte(int pos=0);

+	unsigned short ushort(int pos = 0);

+	unsigned long ulong(int pos = 0);

+	unsigned char ubyte(int pos = 0);

 	char* part(int pos, int length);

-	char* val(int pos=0) { return &value_[pos]; }

+	char* val(int pos = 0) { return &value_[pos]; }

 	unsigned short len(void) { return length_; }

 	unsigned short flags(void) { return flags_; }

 	unsigned short id(void) { return id_; }