[Csp-commits] APPLICATIONS/SimData/Include/SimData LUT.h,1.4,1.5 ObjectInterface.h,1.19,1.20 TypeAdapter.h,1.15,1.16

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv10826/Include/SimData

Modified Files:
	LUT.h ObjectInterface.h TypeAdapter.h 
Log Message:


Index: LUT.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LUT.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LUT.h	18 Jul 2003 19:33:27 -0000	1.4
--- LUT.h	18 Jul 2003 19:47:16 -0000	1.5
***************
*** 20,24 ****
  
  
! #if defined(_MSC_VER) && (_MSC_VER <= 1300)
  	// old versions of msvc can't do partial template specialization
  	#define __SIMDATA_NO_LUT__
--- 20,26 ----
  
  
! #include <SimData/PTS.h>
! 
! #ifdef __PTS_SIM__
  	// old versions of msvc can't do partial template specialization
  	#define __SIMDATA_NO_LUT__

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ObjectInterface.h	9 May 2003 03:51:06 -0000	1.19
--- ObjectInterface.h	18 Jul 2003 19:47:17 -0000	1.20
***************
*** 37,40 ****
--- 37,49 ----
  #include <SimData/Pack.h>
  
+ /*
+  * Simulated Partial Template Specialization
+  *
+  * Adapted from: metactrl.h
+  * by Krzysztof Czarnecki & Ulrich Eisenecker
+  */
+ #include <SimData/PTS.h>
+ 
+ 
  
  NAMESPACE_SIMDATA
***************
*** 47,71 ****
  
  
- /*
-  * Simulated Partial Template Specialization
-  *
-  * Adapted from: metactrl.h
-  * by Krzysztof Czarnecki & Ulrich Eisenecker
-  */
- 
- /* The following functions come from chapter 10 of the indispensable book
-  * Generative Programming by Krzysztof Czarnecki & Ulrich Eisenecker
-  * (C) Copyright Krzysztof Czarnecki & Ulrich Eisenecker 1998-2000.
-  * Permission to copy, use, modify, sell and distribute this software is
-  * granted provided this copyright notice appears in all copies. In case of
-  * modification, the modified files should carry a notice stating that
-  * you changed the files.
-  * This software is provided "as is" without express or implied
-  * warranty, and with no claim as to its suitability for any purpose.
-  */
- 
- #if defined(_MSC_VER) && (_MSC_VER <= 1300)
- 	#define __PTS_SIM__
- #endif
  
  /**
--- 56,59 ----

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TypeAdapter.h	18 Jul 2003 10:14:48 -0000	1.15
--- TypeAdapter.h	18 Jul 2003 19:47:17 -0000	1.16
***************
*** 41,44 ****
--- 41,45 ----
  
  #include <SimData/Types.h>
+ #include <SimData/PTS.h>
  
  
***************
*** 63,66 ****
--- 64,68 ----
  class Object;
  
+ #ifndef __PTS_SIM__
  template <int N, typename X>
  class LUT;
***************
*** 69,72 ****
--- 71,75 ----
  typedef LUT<2,float> Table2;
  typedef LUT<3,float> Table3;
+ #endif // __PTS_SIM__
  
  SIMDATA_EXCEPTION(TypeMismatch)
***************
*** 209,215 ****
--- 212,220 ----
  	inline void set(Curve & x) const { setBase(x); }
  	inline void set(Table & x) const { setBase(x); }
+ #ifndef __PTS_SIM__
  	inline void set(Table1 & x) const { setBase(x); }
  	inline void set(Table2 & x) const { setBase(x); }
  	inline void set(Table3 & x) const { setBase(x); }
+ #endif // __PTS_SIM__
  	inline void set(External & x) const { setBase(x); }
  	inline void set(Key & x) const { setBase(x); }