SWIGJAVA: Remove the last JAVA ifdefs from src

Removed all references to #ifdef SWIGJAVA and JAVACALLBACK from the
library source.  All java-specific source code has been moved to the
corresponding library's .i file for java.

    * Update library source
    * Update examples where necessary
    * The function pointer methodology has been remove from libraries
      which provided callbacks as both a class and a function pointer
      implementation.  Examples were updated to use the class version
      of callbacks.
    * Updated documentation for SWIGJAVA

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-01-23 11:58:12 -08:00
parent d49ab2ac95
commit 666452e873
44 changed files with 280 additions and 509 deletions

View File

@@ -600,25 +600,23 @@ void H3LIS331DL::getXYZ(int *x, int *y, int*z)
*z = (m_rawZ - m_adjZ);
}
#ifdef SWIGJAVA
float *H3LIS331DL::getAcceleration()
std::vector<float> H3LIS331DL::getAcceleration()
{
float *v = new float[3];
std::vector<float> v(3);
getAcceleration(&v[0], &v[1], &v[2]);
return v;
}
int *H3LIS331DL::getRawXYZ()
std::vector<int> H3LIS331DL::getRawXYZ()
{
int *v = new int[3];
std::vector<int> v(3);
getRawXYZ(&v[0], &v[1], &v[2]);
return v;
}
int *H3LIS331DL::getXYZ()
std::vector<int> H3LIS331DL::getXYZ()
{
int *v = new int[3];
std::vector<int> v(3);
getXYZ(&v[0], &v[1], &v[2]);
return v;
}
#endif