From af417d3ae16123fbc994941b20eff219681e0d46 Mon Sep 17 00:00:00 2001 From: Abhishek Malik Date: Sat, 10 Sep 2016 13:29:34 -0700 Subject: [PATCH] Fixing Build errors Signed-off-by: Abhishek Malik --- examples/c++/temperature.cxx | 4 +++- examples/c/grovemoisture.c | 2 +- examples/c/tsl2561.c | 2 +- examples/java/CMakeLists.txt | 4 ++-- src/temperature/temperature.cxx | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/c++/temperature.cxx b/examples/c++/temperature.cxx index 93754828..f8eb7dc1 100644 --- a/examples/c++/temperature.cxx +++ b/examples/c++/temperature.cxx @@ -26,7 +26,9 @@ #include #include #include -#include "grove.hpp" +#include "temperature.hpp" + +using namespace std; int main(int argc, char **argv) diff --git a/examples/c/grovemoisture.c b/examples/c/grovemoisture.c index 1786978d..52ae4d18 100644 --- a/examples/c/grovemoisture.c +++ b/examples/c/grovemoisture.c @@ -7,7 +7,7 @@ #include #include "grovemoisture.h" -void main(void) +int main() { grovemoisture_context dev = grovemoisture_init(14); int val; diff --git a/examples/c/tsl2561.c b/examples/c/tsl2561.c index a4d3b628..75c0086b 100644 --- a/examples/c/tsl2561.c +++ b/examples/c/tsl2561.c @@ -7,7 +7,7 @@ #include #include "tsl2561.h" -void main(void) +int main() { tsl2561_context dev = tsl2561_init(0, TSL2561_Address, GAIN_0X, INTEGRATION_TIME1_101MS); float abc = 0; diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index 55c9a9fb..bf7ae9b0 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -38,7 +38,7 @@ add_example(Emg emg) add_example(Gsr gsr) add_example(GroveLed_multiSample grove) add_example(GroveLEDSample grove) -add_example(LightSample grove) +add_example(LightSample light) add_example(GroveLineFinderSample grovelinefinder) add_example(GroveMDSample grovemd) add_example(GroveMoistureSample grovemoisture) @@ -49,7 +49,7 @@ add_example(GroveQTouch at42qt1070) add_example(GroveRelaySample grove) add_example(GroveRotarySample grove) add_example(GROVESCAMSample grovescam) -add_example(SlideSample grove) +add_example(SlideSample slide) add_example(GroveSpeakerSample grovespeaker) add_example(TemperatureSample temperature) add_example(VDivSample vdiv) diff --git a/src/temperature/temperature.cxx b/src/temperature/temperature.cxx index 0e6973a3..0938a230 100644 --- a/src/temperature/temperature.cxx +++ b/src/temperature/temperature.cxx @@ -31,6 +31,7 @@ #include "temperature.hpp" #include "math.h" +using namespace std; using namespace upm; Temperature::Temperature(unsigned int pin, float scale, int r0, int b)