Commit 23b7c92c authored by Jacob Gladish's avatar Jacob Gladish

Fixed build on desktop linux.

parent b2e696fd
......@@ -46,7 +46,9 @@ namespace bridge
if (!arr.empty())
{
st = msg.Set(sig.c_str(), arr.size(), &arr[0]);
T const& ref = arr.front();
T const* p = &ref;
st = msg.Set(sig.c_str(), arr.size(), p);
msg.Stabilize();
}
else
......
......@@ -55,7 +55,7 @@ namespace
common::Logger::Level sDefaultLoggingLevel = common::Logger::DSB_LOGLEVEL_INFO;
#ifdef __APPLE__
#if defined(__APPLE__) || defined(__linux__)
#define ThreadId_FMT "%p"
pthread_t GetCurrentThreadId() { return pthread_self(); }
#else
......
#include "Variant.h"
#include <string.h>
common::Variant::Data::Data()
{
......
......@@ -24,7 +24,7 @@ ALLJOYN_INSTALL_DIR?=/Users/jgladi200/Work/alljoyn/alljoyn-15.09.00a-src/build/d
CXXFLAGS=-D QCC_OS_GROUP_POSIX -Wall -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -g -std=c++0x -I. -I$(ALLJOYN_INSTALL_DIR)/inc -I$(LIBXML_INC)
CXXFLAGS+=-Wno-ignored-qualifiers
LDFLAGS=-L $(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2
LDFLAGS=-L $(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2 -pthread -luuid
DEV_PROVIDER_OBJS=$(patsubst %.cpp, %.o, $(SRCS))
OBJS=$(DEV_PROVIDER_OBJS)
......
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