Commit 1f060f77 authored by Brendan Long's avatar Brendan Long

Fix warnings by removing or using unused variables, initializing a variable,...

Fix warnings by removing or using unused variables, initializing a variable, and turning off unfixable warnings.
parent 3dfaaa98
...@@ -94,7 +94,7 @@ QStatus AllJoynAbout::GetDeviceId(std::string& deviceId) ...@@ -94,7 +94,7 @@ QStatus AllJoynAbout::GetDeviceId(std::string& deviceId)
return st; return st;
} }
QStatus AllJoynAbout::ReadDeviceId(std::string& deviceId) QStatus AllJoynAbout::ReadDeviceId(std::string&)
{ {
// TODO read from config // TODO read from config
return ER_FAIL; return ER_FAIL;
......
...@@ -162,7 +162,7 @@ Leave: ...@@ -162,7 +162,7 @@ Leave:
return ret == 0 ? ER_OK : ER_FAIL; return ret == 0 ? ER_OK : ER_FAIL;
} }
void Bridge::DeviceSystemBridge::OnAdapterSignal(IAdapterSignal const& signal, void* argp) void Bridge::DeviceSystemBridge::OnAdapterSignal(IAdapterSignal const& signal, void*)
{ {
// TODO // TODO
shared_ptr<IAdapterDevice> adapterDevice; shared_ptr<IAdapterDevice> adapterDevice;
......
...@@ -136,7 +136,7 @@ QStatus Bridge::BridgeConfig::FromFile(std::string const& fileName) ...@@ -136,7 +136,7 @@ QStatus Bridge::BridgeConfig::FromFile(std::string const& fileName)
xmlFreeDoc(m_doc); xmlFreeDoc(m_doc);
m_doc = doc; m_doc = doc;
return ER_OK; return st;
} }
QStatus Bridge::BridgeConfig::ToFile(std::string const& fileName) QStatus Bridge::BridgeConfig::ToFile(std::string const& fileName)
......
...@@ -6,7 +6,7 @@ QStatus Bridge::BridgeDevice::Shutdown() ...@@ -6,7 +6,7 @@ QStatus Bridge::BridgeDevice::Shutdown()
return st; return st;
} }
QStatus Bridge::BridgeDevice::Initialize(shared_ptr<IAdapterDevice> const& dev) QStatus Bridge::BridgeDevice::Initialize(shared_ptr<IAdapterDevice> const&)
{ {
QStatus st = ER_OK; QStatus st = ER_OK;
return st; return st;
......
...@@ -14,7 +14,7 @@ namespace Common ...@@ -14,7 +14,7 @@ namespace Common
uuid_generate_random(uuid); uuid_generate_random(uuid);
#ifdef __linux__ #ifdef __linux__
char* s; char s[37];
#else #else
uuid_string_t s; uuid_string_t s;
#endif #endif
......
...@@ -16,9 +16,9 @@ LIBXML_INC=/usr/include/libxml2 ...@@ -16,9 +16,9 @@ LIBXML_INC=/usr/include/libxml2
#ALLJOYN_INSTALL_DIR=/Users/jgladi200/Work/alljoyn/alljoyn-15.04.00-src/build/darwin/x86/debug/dist/cpp #ALLJOYN_INSTALL_DIR=/Users/jgladi200/Work/alljoyn/alljoyn-15.04.00-src/build/darwin/x86/debug/dist/cpp
ALLJOYN_INSTALL_DIR=/home/gladish/work/alljoyn-15.09.00-src/build/linux/x86_64/debug/dist/cpp/ ALLJOYN_INSTALL_DIR=/home/gladish/work/alljoyn-15.09.00-src/build/linux/x86_64/debug/dist/cpp/
CXXFLAGS=-D QCC_OS_GROUP_POSIX -Wall -Wextra -g -std=c++0x -I. -I$(ALLJOYN_INSTALL_DIR)/inc -I$(LIBXML_INC) 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)
LDFLAGS=-L $(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2 -pthread -luuid LDFLAGS=-L $(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2 -pthread -luuid
DEV_PROVIDER_OBJS=$(patsubst %.cpp, %.o,$(SRCS)) DEV_PROVIDER_OBJS=$(patsubst %.cpp, %.o, $(SRCS))
OBJS=$(DEV_PROVIDER_OBJS) OBJS=$(DEV_PROVIDER_OBJS)
all: moc-adapter all: moc-adapter
...@@ -26,8 +26,6 @@ all: moc-adapter ...@@ -26,8 +26,6 @@ all: moc-adapter
clean: clean:
$(RM) MockAdapter core DeviceProviders/*.o Bridge/*.o Common/*.o Adapters/MockAdapter/*.o $(RM) MockAdapter core DeviceProviders/*.o Bridge/*.o Common/*.o Adapters/MockAdapter/*.o
moc-adapter: $(OBJS) moc-adapter: $(OBJS)
$(CXX) -o $@ $^ $(LDFLAGS) $(CXX) -o $@ $^ $(LDFLAGS)
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