Manual Patch: Programs Tidying 2 of x

[Jeffrey]

This is the second of x patches to tidying the programs written for
the POOMA manual.

2002-Jan-31  Jeffrey D. Oldham  <oldham at codesourcery.com>

	* Sequential/include.mk: New file supporting Pooma compilation.
	* Sequential/makefile: Basically unchanged.
	* Templates/pairs-templated.cpp: This file was moved to Sequential/.
	* Templates/pairs-untemplated.cpp: Likewise.

Applied to mainline.

Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: Sequential/include.mk
===================================================================
RCS file: include.mk
diff -N include.mk
*** /dev/null	Fri Mar 23 21:37:44 2001
--- include.mk	Thu Jan 31 17:23:22 2002
***************
*** 0 ****
--- 1,59 ----
+ # Generated by mm.pl: Mon Mar  9 13:58:39 MST 1998
+ # ACL:license
+ #  ----------------------------------------------------------------------
+ #  This software and ancillary information (herein called "SOFTWARE")
+ #  called POOMA (Parallel Object-Oriented Methods and Applications) is
+ #  made available under the terms described here.  The SOFTWARE has been
+ #  approved for release with associated LA-CC Number LA-CC-98-65.
+ #  
+ #  Unless otherwise indicated, this SOFTWARE has been authored by an
+ #  employee or employees of the University of California, operator of the
+ #  Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+ #  the U.S. Department of Energy.  The U.S. Government has rights to use,
+ #  reproduce, and distribute this SOFTWARE. The public may copy, distribute,
+ #  prepare derivative works and publicly display this SOFTWARE without 
+ #  charge, provided that this Notice and any statement of authorship are 
+ #  reproduced on all copies.  Neither the Government nor the University 
+ #  makes any warranty, express or implied, or assumes any liability or 
+ #  responsibility for the use of this SOFTWARE.
+ #  
+ #  If SOFTWARE is modified to produce derivative works, such modified
+ #  SOFTWARE should be clearly marked, so as not to confuse it with the
+ #  version available from LANL.
+ #  
+ #  For more information about POOMA, send e-mail to pooma at acl.lanl.gov,
+ #  or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
+ #  ----------------------------------------------------------------------
+ # ACL:license
+ 
+ 
+ # Wrap make components from SHARED_ROOT and the current directory in the 
+ # proper order so that variables like ODIR have the correct directory-specific 
+ # value at the right moment.  See the included files for details of what they 
+ # are doing. This file should NOT be manually edited.
+ 
+ # Set NEXTDIR, THISDIR and DIR_LIST
+ include $(SHARED_ROOT)/include1.mk
+ 
+ # Include list of subdirectories to process
+ -include $(THISDIR)/subdir.mk
+ 
+ # Set ODIR, PROJECT_INCLUDES, UNIQUE
+ include $(SHARED_ROOT)/include2.mk
+ 
+ # Set list of object files, relative to ODIR
+ -include $(THISDIR)/objfile.mk
+ 
+ # Set rules for the ODIR directory 
+ include $(SHARED_ROOT)/compilerules.mk
+ 
+ # Remove current dir from DIR_LIST
+ DIR_LIST :=$(filter-out $(firstword $(DIR_LIST)), $(DIR_LIST))
+ 
+ 
+ # ACL:rcsinfo
+ #  ----------------------------------------------------------------------
+ #  $RCSfile: include.mk,v $   $Author: oldham $
+ #  $Revision: 1.1 $   $Date: 2001/12/04 00:07:00 $
+ #  ----------------------------------------------------------------------
+ # ACL:rcsinfo
Index: Sequential/makefile
===================================================================
RCS file: /home/pooma/Repository/r2/examples/Manual/Sequential/makefile,v
retrieving revision 1.1
diff -c -p -r1.1 makefile
*** Sequential/makefile	2002/01/25 03:45:54	1.1
--- Sequential/makefile	2002/02/01 00:23:22
*************** include $(PROJECT_ROOT)/config/head.mk
*** 33,39 ****
  
  PASS=APP
  
! default:: array-copy array-size data-parallel dynamicarray initialize-finalize
  
  .PHONY: array-copy
  
--- 33,39 ----
  
  PASS=APP
  
! default:: array-copy array-size data-parallel dynamicarray initialize-finalize 
  
  .PHONY: array-copy
  
Index: Templates/pairs-templated.cpp
===================================================================
RCS file: pairs-templated.cpp
diff -N pairs-templated.cpp
*** /tmp/cvsEDeBEL	Thu Jan 31 17:23:22 2002
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,15 ****
- // Declare a template class storing a pair of values with the same type.
- template <typename T>
- struct pair {
-   pair(const int& left, const int& right)
-     : left_(left), right_(right) {}
- 
-   T left_;
-   T right_;
- };
- 
- // Use a class storing a pair of integers.
- pair<int> pair1;
- 
- // Use a class storing a pair of doubles;
- pair<double> pair2;
--- 0 ----
Index: Templates/pairs-untemplated.cpp
===================================================================
RCS file: pairs-untemplated.cpp
diff -N pairs-untemplated.cpp
*** /tmp/cvsKxdfh5	Thu Jan 31 17:23:22 2002
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,17 ****
- // Declare a class storing a pair of integers.
- struct pairOfInts {
-   pairOfInts(const int& left, const int& right)
-     : left_(left), right_(right) {}
- 
-   int left_;
-   int right_;
- };
- 
- // Declare a class storing a pair of doubles.
- struct pairOfDoubles {
-   pairOfDoubles(const double& left, const double& right)
-     : left_(left), right_(right) {}
- 
-   double left_;
-   double right_;
- };
--- 0 ----