merge

testApp/utils/introspectionRegistryTest.cpp

@@ -31,6 +31,9 @@ namespace epics {
             virtual void ensureBuffer(int size) {
             }
 
+            virtual void alignBuffer(int alignment) {
+            }
+
             SerializableControlImpl() {
             }
 
@@ -44,6 +47,9 @@ namespace epics {
             virtual void ensureData(int size) {
             }
 
+            virtual void alignData(int alignment) {
+            }
+
             DeserializableControlImpl() {
             }
 

testApp/utils/transportRegistryTest.cpp

@@ -44,6 +44,7 @@ namespace epics {
         virtual void verified(){};
         virtual void enqueueSendRequest(TransportSender::shared_pointer const & sender){};
         virtual void ensureData(int) {};
+        virtual void alignData(int) {};
         virtual IntrospectionRegistry* getIntrospectionRegistry() {return NULL;};
 	private:
 		string _type;