[Swig-cvs] SWIG/Lib/java java.swg,1.41,1.42

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Lib/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26102

Modified Files:
	java.swg 
Log Message:
Fix so that all the const primitive reference types can be applied to other types

Index: java.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/java/java.swg,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** java.swg	21 Oct 2005 10:43:40 -0000	1.41
--- java.swg	10 Nov 2005 21:26:24 -0000	1.42
***************
*** 387,391 ****
  
  /* primitive types by reference */
! %typemap(in) const bool & (bool temp)
  %{ temp = $input ? true : false; 
     $1 = &temp; %}
--- 387,391 ----
  
  /* primitive types by reference */
! %typemap(in) const bool & ($*1_ltype temp)
  %{ temp = $input ? true : false; 
     $1 = &temp; %}
***************
*** 399,414 ****
  %typemap(javadirectorout) const bool & "$javacall"
  
! %typemap(in) const char & (char temp), 
!              const signed char & (signed char temp), 
!              const unsigned char & (unsigned char temp), 
!              const short & (short temp), 
!              const unsigned short & (unsigned short temp), 
!              const int & (int temp), 
!              const unsigned int & (unsigned int temp), 
!              const long & (long temp), 
!              const unsigned long & (unsigned long temp), 
               const long long & ($*1_ltype temp), 
!              const float & (float temp), 
!              const double & (double temp)
  %{ temp = ($*1_ltype)$input; 
     $1 = &temp; %}
--- 399,414 ----
  %typemap(javadirectorout) const bool & "$javacall"
  
! %typemap(in) const char & ($*1_ltype temp), 
!              const signed char & ($*1_ltype temp), 
!              const unsigned char & ($*1_ltype temp), 
!              const short & ($*1_ltype temp), 
!              const unsigned short & ($*1_ltype temp), 
!              const int & ($*1_ltype temp), 
!              const unsigned int & ($*1_ltype temp), 
!              const long & ($*1_ltype temp), 
!              const unsigned long & ($*1_ltype temp), 
               const long long & ($*1_ltype temp), 
!              const float & ($*1_ltype temp), 
!              const double & ($*1_ltype temp)
  %{ temp = ($*1_ltype)$input; 
     $1 = &temp; %}
***************
*** 444,473 ****
  %typemap(directorin, descriptor="D") const double &         "$input = (jdouble)$1_name;"
  
! %typemap(javadirectorin) const char & (char temp), 
!                          const signed char & (signed char temp), 
!                          const unsigned char & (unsigned char temp), 
!                          const short & (short temp), 
!                          const unsigned short & (unsigned short temp), 
!                          const int & (int temp), 
!                          const unsigned int & (unsigned int temp), 
!                          const long & (long temp), 
!                          const unsigned long & (unsigned long temp), 
                           const long long & ($*1_ltype temp), 
!                          const float & (float temp), 
!                          const double & (double temp)
    "$jniinput"
  
! %typemap(javadirectorout) const char & (char temp), 
!                           const signed char & (signed char temp), 
!                           const unsigned char & (unsigned char temp), 
!                           const short & (short temp), 
!                           const unsigned short & (unsigned short temp), 
!                           const int & (int temp), 
!                           const unsigned int & (unsigned int temp), 
!                           const long & (long temp), 
!                           const unsigned long & (unsigned long temp), 
                            const long long & ($*1_ltype temp), 
!                           const float & (float temp), 
!                           const double & (double temp)
    "$javacall"
  
--- 444,473 ----
  %typemap(directorin, descriptor="D") const double &         "$input = (jdouble)$1_name;"
  
! %typemap(javadirectorin) const char & ($*1_ltype temp), 
!                          const signed char & ($*1_ltype temp), 
!                          const unsigned char & ($*1_ltype temp), 
!                          const short & ($*1_ltype temp), 
!                          const unsigned short & ($*1_ltype temp), 
!                          const int & ($*1_ltype temp), 
!                          const unsigned int & ($*1_ltype temp), 
!                          const long & ($*1_ltype temp), 
!                          const unsigned long & ($*1_ltype temp), 
                           const long long & ($*1_ltype temp), 
!                          const float & ($*1_ltype temp), 
!                          const double & ($*1_ltype temp)
    "$jniinput"
  
! %typemap(javadirectorout) const char & ($*1_ltype temp), 
!                           const signed char & ($*1_ltype temp), 
!                           const unsigned char & ($*1_ltype temp), 
!                           const short & ($*1_ltype temp), 
!                           const unsigned short & ($*1_ltype temp), 
!                           const int & ($*1_ltype temp), 
!                           const unsigned int & ($*1_ltype temp), 
!                           const long & ($*1_ltype temp), 
!                           const unsigned long & ($*1_ltype temp), 
                            const long long & ($*1_ltype temp), 
!                           const float & ($*1_ltype temp), 
!                           const double & ($*1_ltype temp)
    "$javacall"