From: Jelte Jansen <jelte@isc.org>
Date: Wed, 7 Mar 2012 09:33:58 +0000 (+0100)
Subject: [1741] Merge branch 'trac1093' into trac1741
X-Git-Tag: trac2351_base~226^2~116^2~41^2~48^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=736fb87e53b0d57241c4e414ed5de2f3eacc6e6e;p=thirdparty%2Fkea.git

[1741] Merge branch 'trac1093' into trac1741
---

736fb87e53b0d57241c4e414ed5de2f3eacc6e6e
diff --cc src/lib/log/compiler/message.cc
index 3c8a3f2fec,cb93a10217..fb0f038597
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/message.cc
@@@ -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();