From ef412e1b83e19b86d7c377d903945c869691b10e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Thu, 3 Aug 2017 10:47:55 +0100
Subject: [PATCH] argList: addition of fileHandler option moved to argList.C

Patch contributed by Timo Niemi, VTT.
Resolves bug-report https://bugs.openfoam.org/view.php?id=2645
---
 src/OpenFOAM/global/argList/argList.C            |  7 +++++++
 .../fileOperations/fileOperation/fileOperation.C | 16 ----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 9d5ca421c..8c43a70cb 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -72,6 +72,13 @@ Foam::argList::initValidTables::initValidTables()
         "do not execute functionObjects"
     );
 
+    argList::addOption
+    (
+        "fileHandler",
+        "handler",
+        "override the fileHandler"
+     );
+
     Pstream::addValidParOptions(validParOptions);
 }
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 5d65cf2e2..5949754fe 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -43,22 +43,6 @@ namespace Foam
     defineTypeNameAndDebug(fileOperation, 0);
     defineRunTimeSelectionTable(fileOperation, word);
 
-    class addArgsOptions
-    {
-        public:
-        addArgsOptions()
-        {
-            argList::addOption
-            (
-                "fileHandler",
-                "handler",
-                "override the fileHandler"
-            );
-        }
-    };
-
-    addArgsOptions intObj;
-
     word fileOperation::defaultFileHandler
     (
         debug::optimisationSwitches().lookupOrAddDefault