java_interfaces: Moved ifdefs for swig version

Moved the SWIG version check from each sensor library .i file to
the base SWIG .i file (per interface).  This cleans up the number
of #if SWIG_VERSION's across the code base, and will make cleanup
of these easier at a later date.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2017-03-03 10:24:26 -08:00
parent cfb4105dd8
commit 51a181a14f
19 changed files with 39 additions and 44 deletions

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::IADC);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::IADC);
%include "iADC.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::ICO2Sensor);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::ICO2Sensor);
%include "iCO2Sensor.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::IHumiditySensor);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::IHumiditySensor);
%include "iHumiditySensor.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::ILightController);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::ILightController);
%include "iLightController.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::ILightSensor);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::ILightSensor);
%include "iLightSensor.hpp"

View File

@ -1,5 +1,6 @@
%include <swiginterface.i>
%interface_impl(upm::IModuleStatus);
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::IModuleStatus);
#endif
%include "iModuleStatus.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::IPressureSensor);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::IPressureSensor);
%include "iPressureSensor.hpp"

View File

@ -1,6 +1,9 @@
%include <swiginterface.i>
#if SWIG_VERSION >= 0x030009
%include <swiginterface.i>
%interface_impl(upm::ITemperatureSensor);
#endif
%include "javaupm_interfaces.i"
%include "javaupm_iModuleStatus.i"
%interface_impl(upm::ITemperatureSensor);
%include "iTemperatureSensor.hpp"