Browse Source

merge "default" into LPA-1

LPA-1
Roker 7 years ago
parent
commit
e07ff65537
  1. 2
      Adapter.cc
  2. 3
      Adapter.hh

2
Adapter.cc

@ -26,7 +26,7 @@ namespace pEp {
} }
RuntimeError::RuntimeError(string _text, PEP_STATUS _status) RuntimeError::RuntimeError(string _text, PEP_STATUS _status)
: text(_text), runtime_error(text.c_str()), status(_status) : runtime_error(_text.c_str()), text(_text), status(_status)
{ {
} }

3
Adapter.hh

@ -8,7 +8,6 @@
#include <functional> #include <functional>
#include <string> #include <string>
#include <pEp/sync_api.h> #include <pEp/sync_api.h>
#include "Adapter.hxx"
using namespace std; using namespace std;
@ -37,3 +36,5 @@ namespace pEp {
void shutdown(); void shutdown();
} }
} }
#include "Adapter.hxx"

Loading…
Cancel
Save