fixed previous check-in for the deleted auto-generated assignment operators, now using =default instead of implementing them actually;

removed a few seemingly superfluous 'typename's

Common/Include/DataWriter.h

@@ -52,7 +52,7 @@ public:
     virtual void Destroy() = 0;
     virtual void GetSections(std::map<std::wstring, SectionType, nocase_compare>& sections) = 0;
     virtual bool SaveData(size_t recordStart, const std::map<std::wstring, void*, nocase_compare>& matrices, size_t numRecords, size_t datasetSize, size_t byteVariableSized) = 0;
-    virtual void SaveMapping(std::wstring saveId, const std::map<typename LabelIdType, typename LabelType>& labelMapping) = 0;
+    virtual void SaveMapping(std::wstring saveId, const std::map<LabelIdType, LabelType>& labelMapping) = 0;
 };
 
 
@@ -71,7 +71,7 @@ template<class ElemType>
 class DataWriter : public IDataWriter<ElemType>
 {
 private:
-    IDataWriter *m_dataWriter;  // writer
+    IDataWriter<ElemType> *m_dataWriter;  // writer
     HMODULE m_hModule;  // module handle for the writer DLL
     std::wstring m_dllName; // name of the writer DLL
 
@@ -146,7 +146,7 @@ public:
     // SaveMapping - save a map into the file
     // saveId - name of the section to save into (section:subsection format)
     // labelMapping - map we are saving to the file
-    virtual void SaveMapping(std::wstring saveId, const std::map<typename LabelIdType, typename LabelType>& labelMapping);
+    virtual void SaveMapping(std::wstring saveId, const std::map<LabelIdType, LabelType>& labelMapping);
 };
 
 }}}

Common/Include/commandArgUtil.h

@@ -244,16 +244,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             m_separator = configParser.m_separator;
             m_configName = move(configParser.m_configName);
         }
-        ConfigParser& operator=(const ConfigParser& configParser)
-        {
-            m_separator = configParser.m_separator;
-            m_configName = configParser.m_configName;
-        }
-        ConfigParser& operator=(const ConfigParser&& configParser)
-        {
-            m_separator = configParser.m_separator;
-            m_configName = move(configParser.m_configName);
-        }
+        ConfigParser& operator=(const ConfigParser& configParser) = default;
 
     public:
         // FindBraces - find matching braces in a string starting at the current position
@@ -894,18 +885,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             m_repeatAsterisk = true;
             *this = move(configValue);
         }
-        ConfigArray& operator=(const ConfigArray& configValue)
-        {
-            ConfigParser::operator=(configValue);
-            m_repeatAsterisk = true;
-            *this = configValue;
-        }
-        ConfigArray& operator=(const ConfigArray&& configValue)
-        {
-            ConfigParser::operator=(move(configValue));
-            m_repeatAsterisk = true;
-            *this = move(configValue);
-        }
+        ConfigArray& operator=(const ConfigArray& configValue) = default;
 
         // cast a configArray back to a string so we can return it as a ConfigValue
         operator ConfigValue()