--- a/libinterp/octave-value/ov-java.cc	Wed Aug 17 08:20:26 2016 -0700
+++ b/libinterp/octave-value/ov-java.cc	Wed Aug 17 11:43:27 2016 -0400
@@ -184,100 +184,99 @@
 
 namespace octave
 {
-class JVMArgs
-{
-public:
-
-  JVMArgs (void)
-  {
-    vm_args.version = JNI_VERSION_1_2;
-    vm_args.nOptions = 0;
-    vm_args.options = 0;
-    vm_args.ignoreUnrecognized = false;
-  }
-
-  ~JVMArgs (void)
-  {
-    clean ();
-  }
-
-  JavaVMInitArgs *to_args ()
-  {
-    update ();
-    return &vm_args;
-  }
-
-  void add (const std::string& opt)
-  {
-    java_opts.push_back (opt);
-  }
-
-  void read_java_opts (const std::string& filename)
+  class JVMArgs
   {
-    std::ifstream js (filename.c_str ());
-
-    if (! js.bad () && ! js.fail ())
-      {
-        std::string line;
-
-        while (! js.eof () && ! js.fail ())
-          {
-            std::getline (js, line);
-
-            if (line.find ("-") == 0)
-              java_opts.push_back (line);
-            else if (line.length () > 0 && Vdebug_java)
-              std::cerr << "invalid JVM option, skipping: " << line << std::endl;
-          }
-      }
-  }
-
-private:
-
-  void clean (void)
-  {
-    if (vm_args.options != 0)
-      {
-        for (int i = 0; i < vm_args.nOptions; i++)
-          delete [] vm_args.options[i].optionString;
-
-        delete [] vm_args.options;
-
-        vm_args.options = 0;
-        vm_args.nOptions = 0;
-      }
-  }
-
-  void update (void)
-  {
-    clean ();
-
-    if (java_opts.size () > 0)
-      {
-        int index = 0;
-
-        vm_args.nOptions = java_opts.size ();
-        vm_args.options = new JavaVMOption [vm_args.nOptions];
-
-        for (std::list<std::string>::const_iterator it = java_opts.begin ();
-             it != java_opts.end (); ++it)
-          {
-            if (Vdebug_java)
-              std::cout << *it << std::endl;
-            vm_args.options[index++].optionString = strsave ((*it).c_str ());
-          }
-
-        java_opts.clear ();
-      }
-  }
-
-private:
-
-  JavaVMInitArgs vm_args;
-
-  std::list<std::string> java_opts;
-};
-
+  public:
+
+    JVMArgs (void)
+    {
+      vm_args.version = JNI_VERSION_1_2;
+      vm_args.nOptions = 0;
+      vm_args.options = 0;
+      vm_args.ignoreUnrecognized = false;
+    }
+
+    ~JVMArgs (void)
+    {
+      clean ();
+    }
+
+    JavaVMInitArgs *to_args ()
+    {
+      update ();
+      return &vm_args;
+    }
+
+    void add (const std::string& opt)
+    {
+      java_opts.push_back (opt);
+    }
+
+    void read_java_opts (const std::string& filename)
+    {
+      std::ifstream js (filename.c_str ());
+
+      if (! js.bad () && ! js.fail ())
+        {
+          std::string line;
+
+          while (! js.eof () && ! js.fail ())
+            {
+              std::getline (js, line);
+
+              if (line.find ("-") == 0)
+                java_opts.push_back (line);
+              else if (line.length () > 0 && Vdebug_java)
+                std::cerr << "invalid JVM option, skipping: " << line << std::endl;
+            }
+        }
+    }
+
+  private:
+
+    void clean (void)
+    {
+      if (vm_args.options != 0)
+        {
+          for (int i = 0; i < vm_args.nOptions; i++)
+            delete [] vm_args.options[i].optionString;
+
+          delete [] vm_args.options;
+
+          vm_args.options = 0;
+          vm_args.nOptions = 0;
+        }
+    }
+
+    void update (void)
+    {
+      clean ();
+
+      if (java_opts.size () > 0)
+        {
+          int index = 0;
+
+          vm_args.nOptions = java_opts.size ();
+          vm_args.options = new JavaVMOption [vm_args.nOptions];
+
+          for (std::list<std::string>::const_iterator it = java_opts.begin ();
+               it != java_opts.end (); ++it)
+            {
+              if (Vdebug_java)
+                std::cout << *it << std::endl;
+              vm_args.options[index++].optionString = strsave ((*it).c_str ());
+            }
+
+          java_opts.clear ();
+        }
+    }
+
+  private:
+
+    JavaVMInitArgs vm_args;
+
+    std::list<std::string> java_opts;
+  };
 }
 
 #if defined (OCTAVE_USE_WINDOWS_API)