Commit bcdf2992 authored by Davis King's avatar Davis King

Changed code so serialization works with the lite version of protocol buffers

as well as the normal version.
parent 4937d439
...@@ -1044,12 +1044,12 @@ namespace dlib ...@@ -1044,12 +1044,12 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
} }
// forward declare the Message object so we can reference it below. // forward declare the MessageLite object so we can reference it below.
namespace google namespace google
{ {
namespace protobuf namespace protobuf
{ {
class Message; class MessageLite;
} }
} }
...@@ -1067,7 +1067,7 @@ namespace dlib ...@@ -1067,7 +1067,7 @@ namespace dlib
}; };
template <typename T> template <typename T>
struct is_protocol_buffer <T,typename enable_if<is_convertible<T*,::google::protobuf::Message*> >::type > struct is_protocol_buffer <T,typename enable_if<is_convertible<T*,::google::protobuf::MessageLite*> >::type >
{ {
static const bool value = true; static const bool value = true;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment