Ported IM Invoker for pre 3.0 and beautified code

2 files changed, 4 insertions, 14 deletions

diff --git a/src/uscxml/plugins/invoker/umundo/JSON.pb.h b/src/uscxml/plugins/invoker/umundo/JSON.pb.h
index a8125bf..ff65656 100644
--- a/src/uscxml/plugins/invoker/umundo/JSON.pb.h
+++ b/src/uscxml/plugins/invoker/umundo/JSON.pb.h
@@ -8,16 +8,6 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 2005000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
 
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/message.h>
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
index dd9c37d..1861db7 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
@@ -177,9 +177,9 @@ void UmundoInvoker::invoke(const InvokeRequest& req) {
 
 	umundo::MDNSDiscoveryOptions discOpts;
 	_discovery = new umundo::Discovery(umundo::Discovery::MDNS, &discOpts);
-	
+
 	_discovery->add(*_node);
-	
+
 	// add type from .proto or .desc files
 	std::list<std::string> type;
 	Event::getParam(req.params, "type", type);
@@ -194,7 +194,7 @@ void UmundoInvoker::invoke(const InvokeRequest& req) {
 		}
 		typeIter++;
 	}
-	
+
 	// add directory with .proto or .desc files
 	std::list<std::string> types;
 	Event::getParam(req.params, "type", types);
@@ -282,7 +282,7 @@ void UmundoInvoker::receive(void* object, umundo::Message* msg) {
 	if (msg->size() > 0) {
 		event.data.compound["protobuf"] = Data(msg->data(), msg->size(), "application/x-protobuf");
 	}
-	
+
 	returnEvent(event);
 }