[cgma-dev] r5170 - cgm/trunk/test

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-09-19 12:32:59 -0500 (Mon, 19 Sep 2011)
New Revision: 5170

Modified:
   cgm/trunk/test/attribute_to_buffer.cpp
   cgm/trunk/test/attribute_to_file.cpp
   cgm/trunk/test/makept.cpp
   cgm/trunk/test/subtract.cpp
Log:
Get rid of build warnings for both occ6.5 and occ6.3, passed make check for both versions.

Modified: cgm/trunk/test/attribute_to_buffer.cpp
===================================================================
--- cgm/trunk/test/attribute_to_buffer.cpp	2011-09-19 16:49:08 UTC (rev 5169)
+++ cgm/trunk/test/attribute_to_buffer.cpp	2011-09-19 17:32:59 UTC (rev 5170)
@@ -70,7 +70,6 @@
   GeometryQueryTool::instance()->delete_geometry();
 
   //check that the two single volume bodys' attributes are exported as SINGLELUMP%
-  printf (p_buffer); 
 
   std::string search ("SINGLELUMP%") ;
   std::string buffer (p_buffer, n_bsize);

Modified: cgm/trunk/test/attribute_to_file.cpp
===================================================================
--- cgm/trunk/test/attribute_to_file.cpp	2011-09-19 16:49:08 UTC (rev 5169)
+++ cgm/trunk/test/attribute_to_file.cpp	2011-09-19 17:32:59 UTC (rev 5170)
@@ -27,8 +27,8 @@
 #endif
 
 #define ASSERT(A) if (!(A)) failed(#A,__FILE__,__LINE__)
-CubitBoolean is_files_same(char* filename1,
-                           char* filename2);
+CubitBoolean is_files_same(std::string filename1,
+                           std::string filename2);
 
 void failed( const char* A, const char* FILE, int LINE )
 {
@@ -69,9 +69,10 @@
   //check that the two single volume bodys' attributes are exported as SINGLELUMP%
   std::ifstream Myfile;
   std::string line;
-  char* search = "SINGLELUMP%";
+  std::string search = "SINGLELUMP%";
   Myfile.open ("bricks2.occ");
-  int found = 0, offset;
+  int found = 0;
+  size_t offset;
   if(Myfile.is_open())
   {
     while(!Myfile.eof())
@@ -136,20 +137,22 @@
   return 0;
 }
 
-CubitBoolean is_files_same(char* filename1,
-                           char* filename2)
+CubitBoolean is_files_same(std::string filename1,
+                           std::string filename2)
 {
   FILE *fp1, *fp2;