]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[1741] Merge branch 'trac1093' into trac1741
authorJelte Jansen <jelte@isc.org>
Wed, 7 Mar 2012 09:33:58 +0000 (10:33 +0100)
committerJelte Jansen <jelte@isc.org>
Wed, 7 Mar 2012 09:33:58 +0000 (10:33 +0100)
1  2 
src/lib/log/compiler/message.cc

index 3c8a3f2fecf80a0005f999e2ba8454dbadbf7b35,cb93a102179c93cfe2fa672d4c9ffb79e5bd6ebc..fb0f0385972f3df33b06031b63b1c8fb476bc01f
@@@ -596,18 -564,14 +600,16 @@@ main(int argc, char* argv[]) 
                  splitNamespace(reader.getNamespace());
  
              // Write the header file.
 -            writeHeaderFile(message_file, ns_components, dictionary);
 +            writeHeaderFile(message_file, ns_components, dictionary,
 +                            output_directory);
  
              // Write the file that defines the message symbols and text
 -            writeProgramFile(message_file, ns_components, dictionary);
 +            writeProgramFile(message_file, ns_components, dictionary,
 +                             output_directory);
          }
  
-         // Finally, warn of any duplicates encountered.
-         warnDuplicates(reader);
      }
 -    catch (MessageException& e) {
 +    catch (const MessageException& e) {
          // Create an error message from the ID and the text
          MessageDictionary& global = MessageDictionary::globalDictionary();
          string text = e.id();