From 4e92cf4e335fc97d830c4a7272ab143de0859f46 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <daniel.goodliffe@pressassociation.com>
Date: Fri, 21 Oct 2016 15:18:54 +0100
Subject: Neaten stream IO with typedefs

---
 slicer/slicer/modelPartsTypes.impl.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/slicer/slicer/modelPartsTypes.impl.h b/slicer/slicer/modelPartsTypes.impl.h
index b3abc2c..259f642 100644
--- a/slicer/slicer/modelPartsTypes.impl.h
+++ b/slicer/slicer/modelPartsTypes.impl.h
@@ -46,10 +46,10 @@ namespace Slicer {
 	typeWrite(::Ice::OutputStreamPtr & s, const ::IceUtil::Optional<T> & m)
 	{
 		typedef Ice::StreamableTraits<T> traits;
+		typedef Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength> SOH;
 		s->startEncapsulation();
-		if (m && s->writeOptional(0,
-				Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength>::optionalFormat)) {
-			Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength>::write(s.get(), *m);
+		if (m && s->writeOptional(0, SOH::optionalFormat)) {
+			SOH::write(s.get(), *m);
 		}
 		s->endEncapsulation();
 	}
@@ -66,11 +66,11 @@ namespace Slicer {
 	typeRead(::Ice::InputStreamPtr & s, ::IceUtil::Optional<T> & m)
 	{
 		typedef Ice::StreamableTraits<T> traits;
+		typedef Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength> SOH;
 		s->startEncapsulation();
-		if (s->readOptional(0,
-				Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength>::optionalFormat)) {
+		if (s->readOptional(0, SOH::optionalFormat)) {
 			m.__setIsSet();
-			Ice::StreamOptionalHelper<T, traits::helper, traits::fixedLength>::read(s.get(), *m);
+			SOH::read(s.get(), *m);
 		}
 		else {
 			m = IceUtil::None;
-- 
cgit v1.2.3