Changeset 1374 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TAppCommon/program_options_lite.cpp

Timestamp:

9 Nov 2015, 21:13:05 (8 years ago)

Author:

tech

Message:

Macro cleanups.

File:

• branches/HTM-15.2-dev/source/Lib/TAppCommon/program_options_lite.cpp (modified) (10 diffs)

branches/HTM-15.2-dev/source/Lib/TAppCommon/program_options_lite.cpp

@@ -111 +111 @@
     }
 
-#if NH_MV_SEI
+#if NH_MV
     static void setOptions(Options::NamesPtrList& opt_list, const std::vector<int> idcs, const string& value, ErrorReporter& error_reporter)
 #else
@@ -121 +121 @@
       for (Options::NamesPtrList::iterator it = opt_list.begin(); it != opt_list.end(); ++it)
       {
-        #if NH_MV_SEI
+#if NH_MV
           Bool doParsing = (*it)->opt->checkDim( idcs, error_reporter ); 
           if ( doParsing )
@@ -127 +127 @@
             (*it)->opt->parse(value, idcs, error_reporter);
           }
-          
-        #else
+#else
         (*it)->opt->parse(value, error_reporter);
-        #endif
+#endif
       }
     }
@@ -290 +289 @@
     bool OptionWriter::storePair(bool allow_long, bool allow_short, const string& name, const string& value)
     {
-#if NH_MV_SEI
+#if NH_MV
       std::vector<int> idcs;             
       
@@ -324 +323 @@
           found = true;
         }
-#if NH_MV_SEI
+#if NH_MV
         if ( idcs.size() > 0 )
         {
@@ -347 +346 @@
           found = true;
         }
-#if NH_MV_SEI
+#if NH_MV
         if ( idcs.size() > 0 )
         {
@@ -362 +361 @@
       }
 
-#if NH_MV_SEI
+#if NH_MV
     if ( !found_idcs )
     {
@@ -370 +369 @@
       if (!found)
       {
-#if NH_MV_SEI
+#if NH_MV
         if (error_reporter.output_on_unknow_parameter )
         {       
@@ -377 +376 @@
         error_reporter.error(where())
           << "Unknown option `" << name << "' (value:`" << value << "')\n";
-#if NH_MV_SEI
+#if NH_MV
         }
 #endif
@@ -383 +382 @@
       }
 
-#if NH_MV_SEI
+#if NH_MV
       setOptions((*opt_it).second, idcs, value, error_reporter);
 #else