diff --git a/autowiring/CoreContext.h b/autowiring/CoreContext.h
index d9672f78a..35f3d3d4f 100644
--- a/autowiring/CoreContext.h
+++ b/autowiring/CoreContext.h
@@ -938,6 +938,9 @@ class CoreContext:
}
};
+///
+/// Forward-declarable version of CoreContext::InjectCurrent
+///
namespace autowiring {
template
void InjectCurrent(void){
diff --git a/autowiring/Deserialize.h b/autowiring/Deserialize.h
index 4f633304e..f121d0391 100644
--- a/autowiring/Deserialize.h
+++ b/autowiring/Deserialize.h
@@ -5,7 +5,7 @@
///
/// Support class for deserializing byte-streams input as std::string into a variety of formats
///
-namespace Auto {
+namespace autowiring {
struct SerializableSigil{};
struct Serialize:
diff --git a/autowiring/EventInputStream.h b/autowiring/EventInputStream.h
index 73b6d81a5..bc283b2cd 100644
--- a/autowiring/EventInputStream.h
+++ b/autowiring/EventInputStream.h
@@ -47,7 +47,7 @@ struct Expression: public ExpressionBase
void DeserializeAndForward(std::deque & d, index_tuple){
auto it = d.begin();
AutoFired sender;
- sender(m_memfunc)(Auto::deser::deserialize(it[I])...);
+ sender(m_memfunc)(autowiring::deser::deserialize(it[I])...);
}
};
diff --git a/autowiring/EventOutputStream.h b/autowiring/EventOutputStream.h
index 685156200..7ff54bef6 100644
--- a/autowiring/EventOutputStream.h
+++ b/autowiring/EventOutputStream.h
@@ -71,14 +71,17 @@ class EventOutputStreamBase {
template
//stub out such that if ARGUMENT defines a static method called AutoSerialize which returns an std::string,
- typename std::enable_if::value, void >::type
+ typename std::enable_if::value, void >::type
SerializeMethod(Arg & arg){
m_OutputStream << "\xD8" << arg.AutoSerialize();
}
template
//SFINAE STUB OUT: replace with check_if overloads <<
- typename std::enable_if const *>::value && !std::is_base_of::value, void >::type
+ typename std::enable_if<
+ !std::is_same const *>::value &&
+ !std::is_base_of::value,
+ void>::type
SerializeMethod(Arg1 & arg1){
assert(false);
//static_assert(false, "Fundamental belief about serialized argument types violated");
diff --git a/src/autowiring/test/MarshalingTest.cpp b/src/autowiring/test/MarshalingTest.cpp
index 9ec18d9d9..050e7a042 100644
--- a/src/autowiring/test/MarshalingTest.cpp
+++ b/src/autowiring/test/MarshalingTest.cpp
@@ -29,7 +29,7 @@ If the types aren't POD. At the very least, tests need to be written which viola
"I can do everything with stringstreams" implementation currently passing
*/
-struct StandardType : public Auto::Serialize{
+struct StandardType : public autowiring::Serialize{
std::string m_str1;
std::string m_str2;
std::string m_str3;