[Sumover-dev] [svn commit] r3773 - vic/trunk/rtp

[sumover-dev at cs.ucl.ac.uk]

Author: socrates
Date: Fri Jul 21 12:48:05 2006
New Revision: 3773

Modified:
   vic/trunk/rtp/session.cpp
   vic/trunk/rtp/source.h

Log:
Got rid of multiple Windows compile-time warnings (VS7.0).

Modified: vic/trunk/rtp/session.cpp
==============================================================================
--- vic/trunk/rtp/session.cpp	(original)
+++ vic/trunk/rtp/session.cpp	Fri Jul 21 12:48:05 2006
@@ -433,6 +433,8 @@
 		}
 		return (Transmitter::command(argc, argv));
 	}
+	//should not be reached
+	return (TCL_ERROR);
 }
 
 void SessionManager::transmit(pktbuf* pb)

Modified: vic/trunk/rtp/source.h
==============================================================================
--- vic/trunk/rtp/source.h	(original)
+++ vic/trunk/rtp/source.h	Fri Jul 21 12:48:05 2006
@@ -213,7 +213,7 @@
 		inline u_int32_t np() const { return (np_); }
 		inline u_int32_t nm() const { return (nm_); }
 		inline u_int32_t ns() const { return (cs_ - fs_); } /* no. expected */
-		inline u_int32_t ehs() const { return (-(fs_ & 0xffff0000) | cs_); }
+		inline u_int32_t ehs() const { return ((-1*(fs_ & 0xffff0000)) | cs_); }
 		inline u_int32_t cs() const { return (cs_); }
 		inline u_int32_t snp() const { return (snp_); }
 		inline u_int32_t sns() const { return (sns_); }