Minor warning fixes

3 files changed, 25 insertions, 22 deletions

diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 8954fbb0deb..ab78a011dab 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -148,6 +148,7 @@ ImplicitContextI::create(const std::string& kind)
 	throw Ice::InitializationException(
 	    __FILE__, __LINE__,
 	    "'" + kind + "' is not a valid value for Ice.ImplicitContext"); 
+        return 0; // Keep the compiler happy.
     }
 }
 
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp
index fa213765592..f2e33fbb69b 100755
--- a/cpp/src/IceGrid/FileParserI.cpp
+++ b/cpp/src/IceGrid/FileParserI.cpp
@@ -6,25 +6,26 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#include <IceGrid/FileParserI.h>

-#include <IceGrid/DescriptorParser.h>

-#include <IceXML/Parser.h>

-#include <Ice/ObjectAdapter.h>

-

-using namespace std;

-using namespace IceGrid;

-

-ApplicationDescriptor

-FileParserI::parse(const string& file, const AdminPrx& admin, const Ice::Current& current)

-{

-    try

-    {

-	return DescriptorParser::parseDescriptor(file, Ice::StringSeq(), map<string, string>(),

-						 current.adapter->getCommunicator(), admin);

-    }

-    catch(const IceXML::ParserException& e)

-    {

-	throw ParseException(e.reason());

-    }

-}

+
+#include <IceGrid/FileParserI.h>
+#include <IceGrid/DescriptorParser.h>
+#include <IceXML/Parser.h>
+#include <Ice/ObjectAdapter.h>
+
+using namespace std;
+using namespace IceGrid;
+
+ApplicationDescriptor
+FileParserI::parse(const string& file, const AdminPrx& admin, const Ice::Current& current)
+{
+    try
+    {
+	return DescriptorParser::parseDescriptor(file, Ice::StringSeq(), map<string, string>(),
+						 current.adapter->getCommunicator(), admin);
+    }
+    catch(const IceXML::ParserException& e)
+    {
+	throw ParseException(e.reason());
+        return ApplicationDescriptor();
+    }
+}
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index f723c27ec6d..2d25e742b74 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2683,6 +2683,7 @@ ServerI::getFilePath(const string& filename) const
     else
     {
 	throw FileNotAvailableException("unknown file");
+        return ""; // Keep the compiler happy.
     }
 }