<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body >Cool! Good job Jane!<br><br><br>-------- Original message --------<br>From: janehu@mcs.anl.gov <br>Date: 11/01/2013 12:45 PM (GMT-06:00) <br>To: cgma-dev@mcs.anl.gov <br>Subject: [cgma-dev] r6082 - in cgm/branches/merge-cubit14.0: . compat compat/new geom itaps test <br> <br><br>Author: janehu<br>Date: 2013-11-01 12:45:08 -0500 (Fri, 01 Nov 2013)<br>New Revision: 6082<br><br>Added:<br> cgm/branches/merge-cubit14.0/compat/<br> cgm/branches/merge-cubit14.0/compat/Makefile.am<br> cgm/branches/merge-cubit14.0/compat/new/<br> cgm/branches/merge-cubit14.0/compat/new/new.h<br> cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp<br> cgm/branches/merge-cubit14.0/geom/CubitCompat.h.in<br> cgm/branches/merge-cubit14.0/geom/CubitCompat.hpp<br> cgm/branches/merge-cubit14.0/test/cylinders.cpp<br> cgm/branches/merge-cubit14.0/test/s5.sat<br> cgm/branches/merge-cubit14.0/test/s5.stp<br> cgm/branches/merge-cubit14.0/test/spheres.cpp<br>Modified:<br> cgm/branches/merge-cubit14.0/itaps/Makefile.am<br> cgm/branches/merge-cubit14.0/itaps/iGeom_CGMA.cc<br> cgm/branches/merge-cubit14.0/test/Makefile.am<br> cgm/branches/merge-cubit14.0/test/r_w.cpp<br> cgm/branches/merge-cubit14.0/test/subtract.cpp<br>Log:<br>Added missing files; Removed some of the warnings; Passed make check for cubit shared, occ static and shared builds. Ready to move to bitbucket.<br><br>Added: cgm/branches/merge-cubit14.0/compat/Makefile.am<br>===================================================================<br>--- cgm/branches/merge-cubit14.0/compat/Makefile.am (rev 0)<br>+++ cgm/branches/merge-cubit14.0/compat/Makefile.am 2013-11-01 17:45:08 UTC (rev 6082)<br>@@ -0,0 +1 @@<br>+EXTRA_DIST = new/new.h<br><br>Added: cgm/branches/merge-cubit14.0/compat/new/new.h<br>===================================================================<br>--- cgm/branches/merge-cubit14.0/compat/new/new.h (rev 0)<br>+++ cgm/branches/merge-cubit14.0/compat/new/new.h 2013-11-01 17:45:08 UTC (rev 6082)<br>@@ -0,0 +1,11 @@<br>+#include <new><br>+<br>+// According to section 18.4 of the 2005-10-19 working draft<br>+// of the C++ Standard (Doc no: N1905=05-0165), these are the <br>+// symbols defined in the <new> header. <br>+<br>+using std::bad_alloc;<br>+using std::nothrow_t;<br>+using std::nothrow;<br>+using std::new_handler;<br>+using std::set_new_handler;<br><br>Added: cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp<br>===================================================================<br>--- cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp (rev 0)<br>+++ cgm/branches/merge-cubit14.0/geom/CubitCompat.cpp 2013-11-01 17:45:08 UTC (rev 6082)<br>@@ -0,0 +1,93 @@<br>+#include "CubitCompat.h"<br>+#include "CubitCompat.hpp"<br>+#include "GeometryQueryTool.hpp"<br>+#include <string.h><br>+<br>+#define CUBIT_COMPAT_FT_ELIF(TYPE) \<br>+ else if (!strcmp(file_type,#TYPE)) \<br>+ return TYPE ## _TYPE<br>+<br>+static Model_File_Type<br>+CubitCompat_file_type( const char* file_type )<br>+{<br>+ if (!file_type)<br>+ return MFT_NOT_DEFINED;<br>+ CUBIT_COMPAT_FT_ELIF(ACIS);<br>+ CUBIT_COMPAT_FT_ELIF(ACIS_SAT);<br>+ CUBIT_COMPAT_FT_ELIF(ACIS_SAB);<br>+ CUBIT_COMPAT_FT_ELIF(ACIS_DEBUG);<br>+ CUBIT_COMPAT_FT_ELIF(IGES);<br>+ CUBIT_COMPAT_FT_ELIF(CATIA);<br>+ CUBIT_COMPAT_FT_ELIF(STEP);<br>+ CUBIT_COMPAT_FT_ELIF(PROE);<br></body>