Changeset 698 for branches/Release-2-fixes/src

Timestamp:

10/20/05 16:34:52 (19 years ago)

Author:

mar637

Message:

update to current aips++ system

Location:

branches/Release-2-fixes/src

Files:

• Makefile (modified) (4 diffs)
• SDTemplates.cc (modified) (1 diff)

branches/Release-2-fixes/src/Makefile

@@ -6 +6 @@
 CXXFLAGS += -ansi
 CXXFLAGS += -pedantic -Wno-long-long
+CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
 
 CFITSIOROOT := /usr/local If aips++ is build with LFS you need to have
 # libcfitsio with lfs support
-# CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
-CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
-CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
+CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
+#CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
+#CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
+
 
 CASAROOT  := $(word 1, $(AIPSPATH))
 CASAARCH  := $(word 2, $(AIPSPATH))
-CASAINC   := -I$(CASAROOT)/code/include
+CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/code/casa/wcslib
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
+
+
 # This assumes all casa libs are static only (*.a)
 # if not than there might by symbol resolution errors.
@@ -23 +27 @@
              -latnf -limages -lms -lcomponents -lcoordinates \
              -llattices -lfits -lmeasures -lmeasures_f \
-             -ltables -lscimath -lscimath_f -lcasa -lwcs \
+             -ltables -lscimath -lscimath_f -lcasa  \
+             $(CASALIB)/libwcs.a \
               -lrpfits $(CFITSIOLIB) -dy -llapack -lblas -lg2c
 
@@ -36 +41 @@
 
 BOOSTROOT := /usr
-BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python$(PYVERSION)
+BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
 BOOSTINC  := -I$(BOOSTROOT)/include/boost
 
@@ -97 +102 @@
 .cpp.o:
         -@ echo
-           $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .cc.o:
         -@ echo
-           $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .cxx.o:
         -@ echo
-           $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .C.o:
         -@ echo
-           $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 

branches/Release-2-fixes/src/SDTemplates.cc

@@ -75 +75 @@
 template Array<Float>& operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
 template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Float const&);
+template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Array<Float> const&);
+template MaskedArray<Float> const& operator/=<Float>(MaskedArray<Float> const&, Float const&);
 template MaskedArray<Float> operator+<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
 template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
+
+template MaskedArray<Float> operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+
 template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> const& operator/=<Float>(MaskedArray<Float> const&, Float const&);
-template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
+template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, Array<Float> const&);
 template MaskedArray<Float> operator*<Float>(Array<Float> const&, MaskedArray<Float> const&);
 template Float stddev<Float>(MaskedArray<Float> const&);