Changeset 2057

Timestamp:

Sep 11, 2009, 2:11:19 AM (14 years ago)

Author:

Peter

Message:

refs #521. Deprecate class OptionInFile? and OptionOutFile?. Replaced OptinOutFile? with base class OptionFile? in commandline_test

Location:

trunk

Files:

• test/commandline_test.cc (modified) (4 diffs)
• yat/utility/OptionInFile.h (modified) (3 diffs)
• yat/utility/OptionOutFile.h (modified) (3 diffs)

trunk/test/commandline_test.cc

@@ -27 +27 @@
 #include "yat/utility/OptionArg.h"
 #include "yat/utility/OptionFile.h"
-#include "yat/utility/OptionOutFile.h"
 #include "yat/utility/OptionHelp.h"
 #include "yat/utility/OptionSwitch.h"
@@ -52 +51 @@
 int main(int argc, char* argv[])
 {  
-
   yat::test::Suite suite(argc, argv);
 
@@ -525 +523 @@
 bool test_file2(yat::test::Suite& suite)
 {
-  suite.err() << "Testing OptionOutFile... ";
+  suite.err() << "Testing OptionFile in write-protected directory... ";
 
   if (yat::test::run_as_root()) {
@@ -559 +557 @@
   bool ok=true;
   CommandLine cmd;
-  OptionOutFile out(cmd, "o,out", "output to file");
+  OptionFile out(cmd, "o,out", "output to file", false, false, "w");
   OptionSwitch help(cmd, "h,help", "display this help and exit");
 

trunk/yat/utility/OptionInFile.h

@@ -23 +23 @@
 */
 
+#include "deprecate.h"
 #include "OptionFile.h"
 
@@ -35 +36 @@
   /**
      \brief Class for file related options
+
+     \deprecated Provided for backward compatibility with the 0.5
+     API. Use OptionFile and StreamRedirect instead (see CommandLine
+     for example code).
    */
   class OptionInFile : public OptionFile
@@ -66 +71 @@
     std::ifstream* is_;
     
-  };
+  } YAT_DEPRECATE;
 
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/OptionOutFile.h

@@ -24 +24 @@
 */
 
+#include "deprecate.h"
 #include "OptionFile.h"
 
@@ -36 +37 @@
   /**
      \brief Class for file related options
+
+     \deprecated Provided for backward compatibility with the 0.5
+     API. Use OptionFile and StreamRedirect instead (see CommandLine
+     for example code).
    */
   class OptionOutFile : public OptionFile
@@ -51 +56 @@
     */
     OptionOutFile(CommandLine& cmd, std::string name, std::string desc, 
-               bool required=false); 
+               bool required=false) YAT_DEPRECATE; 
 
     /**