[Mobies-commit] [commit] r4077 - in UDM/trunk: debian/zlib-1.2.3.3.dfsg/contrib/minizip src/UdmDom

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Aug  3 17:33:54 2012
New Revision: 4077

Log:
Fixes for compiling on x64 Ubuntu. Thanks Harmon

Modified:
   UDM/trunk/debian/zlib-1.2.3.3.dfsg/contrib/minizip/Makefile
   UDM/trunk/src/UdmDom/UdmDom.cpp

Modified: UDM/trunk/debian/zlib-1.2.3.3.dfsg/contrib/minizip/Makefile
==============================================================================
--- UDM/trunk/debian/zlib-1.2.3.3.dfsg/contrib/minizip/Makefile	Fri Aug  3 17:33:39 2012	(r4076)
+++ UDM/trunk/debian/zlib-1.2.3.3.dfsg/contrib/minizip/Makefile	Fri Aug  3 17:33:54 2012	(r4077)
@@ -1,5 +1,5 @@
 CC=cc
-CFLAGS=$(OPT) -I../.. -Dunix
+CFLAGS=$(OPT) -I../.. -Dunix -fPIC
 
 UNZ_OBJS = miniunz.o unzip.o ioapi.o
 ZIP_OBJS = minizip.o zip.o   ioapi.o

Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp	Fri Aug  3 17:33:39 2012	(r4076)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp	Fri Aug  3 17:33:54 2012	(r4077)
@@ -3861,7 +3861,7 @@
 		resolver->DontUseStrXsd();
 
 		savesystemname = systemname;
-		if(!strnicmp(savesystemname.c_str(),"DOM:", 4)) savesystemname.erase(0,4);
+		if(!strnicmp(savesystemname.c_str(),"DOM:", static_cast<size_t>(4))) savesystemname.erase(0,4);
 
 		::Uml::Diagram dgr = GetRootMeta();
 		try
@@ -3993,7 +3993,7 @@
 
 			UDM_ASSERT( metalocator.length());
 			savesystemname = systemname;
-			if(!strnicmp(savesystemname.c_str(),"DOM:", 4)) savesystemname.erase(0,4);
+			if(!strnicmp(savesystemname.c_str(),"DOM:", static_cast<size_t>(4))) savesystemname.erase(0,4);
 
 			XStr ml(metalocator);
 			MyEntityResolver mr;
@@ -4028,7 +4028,7 @@
 			if(!pp)
 			{
 				string mlExtension = xsd_file.size() >= 4 ?	xsd_file.substr(xsd_file.size() - 4, 4) : "";
-				if(strnicmp(mlExtension.c_str(), ".xsd", 4) != 0 )
+				if(strnicmp(mlExtension.c_str(), ".xsd", static_cast<size_t>(4)) != 0 )
 				{
 					xsd_file += ".xsd";
 					XStr ml2(xsd_file);