Changeset 1778 in Sophya for trunk/SophyaLib/Samba

Timestamp:

Nov 16, 2001, 7:04:15 PM (24 years ago)

Author:

ansari

Message:

MAJ Makefile + modifs cosmetiques ds DataCircleBase , Reza 16/11/01

Location:

trunk/SophyaLib/Samba

Files:

• Makefile (modified) (3 diffs)
• datacirclebase.h (modified) (1 diff)
• objlist.list (modified) (1 diff)

trunk/SophyaLib/Samba/Makefile

@@ -3 +3 @@
 all: $(LIB)libSamba.a
 clean:
-        rm -f $(OBJ)alm.o $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)lambdaBuilder.o $(OBJ)mlobe.o $(OBJ)sambainit.o $(OBJ)scan.o $(OBJ)sphericaltransformserver.o
+        rm -f $(OBJ)alm.o $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)datacirclefake.o $(OBJ)lambdaBuilder.o $(OBJ)mlobe.o $(OBJ)sambainit.o $(OBJ)scan.o $(OBJ)sphericaltransformserver.o
         rm -f $(LIB)libSamba.a
-$(LIB)libSamba.a : $(OBJ)alm.o $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)lambdaBuilder.o $(OBJ)mlobe.o $(OBJ)sambainit.o $(OBJ)scan.o $(OBJ)sphericaltransformserver.o
+$(LIB)libSamba.a : $(OBJ)alm.o $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)datacirclefake.o $(OBJ)lambdaBuilder.o $(OBJ)mlobe.o $(OBJ)sambainit.o $(OBJ)scan.o $(OBJ)sphericaltransformserver.o
         $(ARCXX) $(ARCXXFLAGS) $@ $?
 ifeq ($(CXX),cxx)
@@ -35 +35 @@
  $(INC)machdefs.h
 $(OBJ)circle.o: circle.cc circle.h $(INC)vector3d.h \
+ $(INC)longlat.h \
+ $(INC)machdefs.h \
+ $(INC)utilgeom.h \
+ $(INC)unitvector.h geometry.h
+$(OBJ)datacirclefake.o: datacirclefake.cc datacirclefake.h datacirclebase.h \
+ circle.h $(INC)vector3d.h \
  $(INC)longlat.h \
  $(INC)machdefs.h \
@@ -130 +136 @@
  $(INC)srandgen.h \
  $(INC)nbmath.h \
- $(INC)triangmtx.h lambdaBuilder.h
+ $(INC)triangmtx.h lambdaBuilder.h \
+ $(INC)timing.h

trunk/SophyaLib/Samba/datacirclebase.h

@@ -16 +16 @@
   virtual double getData(double) const = 0;
   virtual void print(ostream&) const= 0;
+
+  // Pour compatibilite avec les autres classes  
+  inline void Print(ostream& s) const { print(s); }
 };
+
+inline ostream& operator<<(ostream& s, const DataCircleBase& c)
+{
+  c.Print(s);
+  return s;
+}
+
 #endif

trunk/SophyaLib/Samba/objlist.list

@@ -2 +2 @@
 bruit.o
 circle.o
+datacirclefake.o
 lambdaBuilder.o
 mlobe.o