summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adam@sigterm.info>2017-03-20 08:06:32 -0400
committerGitHub <noreply@github.com>2017-03-20 08:06:32 -0400
commit466ba4100ae8f18470fdf8f1b3def5aa5f9a5cbb (patch)
tree7156ccd4a7136cb7076dd6e22602fb7dc32267b0
parent032077534232a4fa97736595bdfcfe3c8b9beb58 (diff)
parent756c89cfccb4039bf5b4b59662a0bd7c379287a3 (diff)
Merge pull request #1308 from SaberUK/insp20+warnings
[2.0] Fix some compiler warnings.
-rwxr-xr-xconfigure4
-rw-r--r--include/base.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index d3569d0d0..0cf165a0a 100755
--- a/configure
+++ b/configure
@@ -840,8 +840,8 @@ sub writefiles {
open(FILEHANDLE, ">include/inspircd_config.h.tmp");
print FILEHANDLE <<EOF;
/* Auto generated by configure, do not modify! */
-#ifndef __CONFIGURATION_AUTO__
-#define __CONFIGURATION_AUTO__
+#ifndef INSPIRCD_CONFIG_H
+#define INSPIRCD_CONFIG_H
/* this is for windows support. */
#define CoreExport /**/
diff --git a/include/base.h b/include/base.h
index 0a4456f3a..19222a6f5 100644
--- a/include/base.h
+++ b/include/base.h
@@ -201,7 +201,7 @@ class CoreExport CoreException : public std::exception
* Actually no, it does nothing. Never mind.
* @throws Nothing!
*/
- virtual ~CoreException() throw() {};
+ virtual ~CoreException() throw() {}
/** Returns the reason for the exception.
* The module should probably put something informative here as the user will see this upon failure.
*/