Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index 124fbc58ecb..d85ae3cf2bb 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -36,7 +36,7 @@ public:
     // printHeader() and then emits a "package" statement if
     // necessary.
     //
-    bool openClass(const std::string&, const std::string& = std::string());
+    void openClass(const std::string&, const std::string& = std::string());
 
     virtual void printHeader();
 };
@@ -64,7 +64,7 @@ protected:
     // Given the fully-scoped Java class name, create any intermediate
     // package directories and open the class file
     //
-    bool open(const std::string&);
+    void open(const std::string&);
 
     ::IceUtilInternal::Output& output() const;