Changeset 13:cc0c7db294b9 in rrlib_jni


Ignore:
Timestamp:
02.05.2013 03:44:51 (7 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Phase:
public
Message:

Removed unnecessary #ifdefs (some code was missing before)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • make.xml

    r5 r13  
    11<targets> 
    22  <rrlib name="finroc_core_utils_jni_base" libs="jni"> 
    3     <sources>tJNICalls_JNI.cpp tJNIConvert.h</sources> 
     3    <sources>tJNICalls_JNI.cpp tJNIHelper.cpp tJNIConvert.h</sources> 
    44  </rrlib> 
    55</targets> 
  • tJNIConvert.h

    r12 r13  
    2323#define rrlib__finroc_core_utils_jni__tJNIConvert_h__ 
    2424 
    25 #include "rrlib/finroc_core_utils/definitions.h" 
     25#include "rrlib/finroc_core_utils_jni/tJNIHelper.h" 
    2626#include <jni.h> 
    2727 
    28 #ifdef __JC_CREATE_JNI_WRAPPERS__ 
     28//#ifdef __JC_CREATE_JNI_WRAPPERS__ 
    2929 
    3030namespace finroc 
     
    234234} // namespace finroc 
    235235 
    236 #endif 
     236//#endif 
    237237 
    238238#endif // rrlib__finroc_core_utils_jni__tJNIConvert_h__ 
  • tJNIHelper.cpp

    r12 r13  
    2020 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
    2121 */ 
    22 #include "rrlib/finroc_core_utils/definitions.h" 
     22#include "rrlib/finroc_core_utils_jni/tJNIHelper.h" 
    2323 
    2424namespace finroc 
     
    2727{ 
    2828 
    29 #ifdef __JC_CREATE_JNI_WRAPPERS__ 
     29//#ifdef __JC_CREATE_JNI_WRAPPERS__ 
    3030 
    3131JavaVM* tJNIHelper::jvm = NULL; 
     
    8888} 
    8989 
    90 #endif 
     90//#endif 
    9191 
    9292} // namespace finroc 
  • tJNIHelper.h

    r12 r13  
    2525#include "rrlib/finroc_core_utils/definitions.h" 
    2626 
    27 #ifdef _LIB_RRLIB_FINROC_CORE_UTILS_JNI_BASE_PRESENT_ 
    28 #define __JC_CREATE_JNI_WRAPPERS__ 
    29 #endif 
    30  
    31 #ifdef __JC_CREATE_JNI_WRAPPERS__ 
     27//#ifdef _LIB_RRLIB_FINROC_CORE_UTILS_JNI_BASE_PRESENT_ 
     28//#define __JC_CREATE_JNI_WRAPPERS__ 
     29//#endif 
     30// 
     31//#ifdef __JC_CREATE_JNI_WRAPPERS__ 
    3232#include <jni.h> 
    3333#include "rrlib/finroc_core_utils/tCastCache.h" 
    34 #endif 
     34//#endif 
    3535 
    3636namespace finroc 
     
    3939{ 
    4040 
    41 #ifdef __JC_CREATE_JNI_WRAPPERS__ 
     41//#ifdef __JC_CREATE_JNI_WRAPPERS__ 
    4242class tJNIHelper 
    4343{ 
     
    172172class tJNIWrappableBase {}; 
    173173 
    174 #else 
    175 typedef tSafeDestructible tJNIWrappableBase; 
    176 #endif 
     174//#else 
     175//typedef tSafeDestructible tJNIWrappableBase; 
     176//#endif 
    177177 
    178178/*! 
     
    182182{ 
    183183 
    184 #ifdef __JC_CREATE_JNI_WRAPPERS__ 
     184//#ifdef __JC_CREATE_JNI_WRAPPERS__ 
    185185 
    186186private: 
     
    220220  virtual jobject CreateJavaWrapper(); 
    221221 
    222 #endif 
     222//#endif 
    223223}; 
    224224 
Note: See TracChangeset for help on using the changeset viewer.