svn commit: r474493 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/framing: ProtocolInitiation.cpp ProtocolInitiation.h ProtocolVersion.cpp ProtocolVersion.h

[kpvdr]

Author: kpvdr
Date: Mon Nov 13 12:26:06 2006
New Revision: 474493

URL: http://svn.apache.org/viewvc?view=rev&rev=474493
Log:
Tidy-up of version code

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp?view=diff&rev=474493&r1=474492&r2=474493
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp Mon 
Nov 13 12:26:06 2006
@@ -35,8 +35,8 @@
     buffer.putOctet('P');
     buffer.putOctet(1);//class
     buffer.putOctet(1);//instance
-    buffer.putOctet(version.major_);
-    buffer.putOctet(version.minor_);    
+    buffer.putOctet(version.getMajor());
+    buffer.putOctet(version.getMinor());    
 }
 
 bool qpid::framing::ProtocolInitiation::decode(Buffer& buffer){
@@ -47,8 +47,8 @@
        buffer.getOctet();//P
        buffer.getOctet();//class
        buffer.getOctet();//instance
-       version.major_ = buffer.getOctet();
-       version.minor_ = buffer.getOctet();
+       version.setMajor(buffer.getOctet());
+       version.setMinor(buffer.getOctet());
        return true;
     }else{
        return false;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h?view=diff&rev=474493&r1=474492&r2=474493
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h Mon Nov 
13 12:26:06 2006
@@ -42,8 +42,8 @@
     virtual void encode(Buffer& buffer); 
     virtual bool decode(Buffer& buffer); 
     inline virtual u_int32_t size() const { return 8; }
-    inline u_int8_t getMajor(){ return version.major_; }
-    inline u_int8_t getMinor(){ return version.minor_; }
+    inline u_int8_t getMajor() const { return version.getMajor(); }
+    inline u_int8_t getMinor() const { return version.getMinor(); }
     inline const ProtocolVersion& getVersion() const { return version; }
 };
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp?view=diff&rev=474493&r1=474492&r2=474493
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp Mon Nov 
13 12:26:06 2006
@@ -37,7 +37,7 @@
 
 ProtocolVersion::~ProtocolVersion()
 {}
-    
+
 bool  ProtocolVersion::equals(u_int8_t _major, u_int8_t _minor) const
 {
     return major_ == _major && minor_ == _minor;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h?view=diff&rev=474493&r1=474492&r2=474493
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h Mon Nov 13 
12:26:06 2006
@@ -30,15 +30,20 @@
 
 class ProtocolVersion
 {
-public:
+private:
     u_int8_t major_;
        u_int8_t minor_;
     
+public:
     ProtocolVersion();
     ProtocolVersion(u_int8_t _major, u_int8_t _minor);
     ProtocolVersion(const ProtocolVersion& p);
     virtual ~ProtocolVersion();
-    
+
+    inline u_int8_t getMajor() const { return major_; }
+    inline void setMajor(u_int8_t major) { major_ = major; }
+    inline u_int8_t getMinor() const { return minor_; }
+    inline void setMinor(u_int8_t minor) { minor_ = minor; }
     virtual bool equals(u_int8_t _major, u_int8_t _minor) const;
     virtual bool equals(const ProtocolVersion& p) const;
     virtual const std::string toString() const;