[Yassl-commit] yassl/taocrypt/include integer.hpp,1.1.1.1,1.2 misc.hpp,1.1.1.1,1.2 runtime.hpp,1.1.1.1,1.2 types.hpp,1.1.1.1,1.2

[Todd O. <to...@us...>]

Update of /cvsroot/yassl/yassl/taocrypt/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26097/taocrypt/include

Modified Files:
	integer.hpp misc.hpp runtime.hpp types.hpp 
Log Message:
merge updates from Magnus with current

Index: runtime.hpp
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/include/runtime.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** runtime.hpp	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- runtime.hpp	11 Apr 2006 20:34:30 -0000	1.2
***************
*** 26,33 ****
  
  
! #if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) && !defined(__ICC)
! 
  #define yaSSL_NEW_HPP
  
  #if __GNUC__ > 2
  
--- 26,50 ----
  
  
! #ifndef yaSSL_NEW_HPP
  #define yaSSL_NEW_HPP
  
+ 
+ #ifdef __sun
+  
+ #include <assert.h>
+ 
+ // Handler for pure virtual functions
+ namespace __Crun {
+     static void pure_error(void)
+     {
+        assert("Pure virtual method called." == "Aborted");
+     }
+ } // namespace __Crun
+ 
+ #endif // __sun
+ 
+ 
+ #if defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+ 
  #if __GNUC__ > 2
  
***************
*** 51,54 ****
  
  #endif // __GNUC__ > 2
! #endif // yaSSL_NEW_HPP && __GNUC__
  
--- 68,72 ----
  
  #endif // __GNUC__ > 2
! #endif // compiler check
! #endif // yaSSL_NEW_HPP
  

Index: types.hpp
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/include/types.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** types.hpp	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- types.hpp	11 Apr 2006 20:34:30 -0000	1.2
***************
*** 62,66 ****
  // compilers we've found 64-bit multiply insructions for
  #if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX)
!     #define HAVE_64_MULTIPLY
  #endif
  
--- 62,68 ----
  // compilers we've found 64-bit multiply insructions for
  #if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX)
!     #if !(defined(__ICC) || defined(__INTEL_COMPILER))
!         #define HAVE_64_MULTIPLY
!     #endif
  #endif
  

Index: misc.hpp
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/include/misc.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** misc.hpp	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- misc.hpp	11 Apr 2006 20:34:30 -0000	1.2
***************
*** 41,44 ****
--- 41,49 ----
  namespace TaoCrypt {
  
+ 
+ // Delete static singleton holders
+ void CleanUp();
+ 
+ 
  #ifdef YASSL_PURE_C
  
***************
*** 124,128 ****
  
  // no gas on these systems ?, disable for now
! #if defined(__sun__) || defined (__QNX__)
      #define TAOCRYPT_DISABLE_X86ASM
  #endif
--- 129,138 ----
  
  // no gas on these systems ?, disable for now
! #if defined(__sun__) || defined (__QNX__) || defined (__APPLE__)
!     #define TAOCRYPT_DISABLE_X86ASM
! #endif
! 
! // icc problem with -03 and integer, disable for now
! #if defined(__INTEL_COMPILER)
      #define TAOCRYPT_DISABLE_X86ASM
  #endif

Index: integer.hpp
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/include/integer.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** integer.hpp	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- integer.hpp	11 Apr 2006 20:34:30 -0000	1.2
***************
*** 275,281 ****
      AlignedWordBlock reg_;
      Sign             sign_;
- 
-     static const Integer zero_;
-     static const Integer one_;
  };
  
--- 275,278 ----