BIND 10 trac2351, updated. f89822d74a4e58d20a8c4793901fdb232e907027 proper nonassignable and other fixes

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Oct 15 11:13:02 UTC 2012


The branch, trac2351 has been updated
       via  f89822d74a4e58d20a8c4793901fdb232e907027 (commit)
      from  7ea3a334b9f55c7af5e6efd79311e40a44d6bc03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f89822d74a4e58d20a8c4793901fdb232e907027
Author: Francis Dupont <fdupont at isc.org>
Date:   Mon Oct 15 13:12:55 2012 +0200

    proper nonassignable and other fixes

-----------------------------------------------------------------------

Summary of changes:
 src/lib/exceptions/exceptions.h                    |    2 +-
 src/lib/util/nonassignable.h                       |    4 +---
 src/lib/util/noncopyable.h                         |    4 +---
 .../VS/libb10-exceptions/libb10-exceptions.vcxproj |    8 ++++----
 4 files changed, 7 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/exceptions/exceptions.h b/src/lib/exceptions/exceptions.h
index e009e41..5a7641f 100644
--- a/src/lib/exceptions/exceptions.h
+++ b/src/lib/exceptions/exceptions.h
@@ -32,7 +32,7 @@ namespace isc {
 /// triggered.
 ///
 class B10_LIBEXCEPTIONS_API Exception :
-    isc::util::nonassignable, public std::exception {
+    public isc::util::nonassignable, public std::exception {
 public:
     ///
     /// \name Constructors and Destructor
diff --git a/src/lib/util/nonassignable.h b/src/lib/util/nonassignable.h
index 7dc707d..c32fd4e 100644
--- a/src/lib/util/nonassignable.h
+++ b/src/lib/util/nonassignable.h
@@ -17,13 +17,11 @@
 #ifndef __NONASSIGNABLE_
 #define __NONASSIGNABLE_
 
-#include <util/dll.h>
-
 namespace isc {
 namespace util {
 namespace nonassignable_ {
 
-class B10_LIBUTIL_API nonassignable {
+class nonassignable {
 protected:
     nonassignable() {}
     ~nonassignable() {}
diff --git a/src/lib/util/noncopyable.h b/src/lib/util/noncopyable.h
index cbdfcd8..f819fc3 100644
--- a/src/lib/util/noncopyable.h
+++ b/src/lib/util/noncopyable.h
@@ -17,13 +17,11 @@
 #ifndef __NONCOPYABLE_
 #define __NONCOPYABLE_
 
-#include <util/dll.h>
-
 namespace isc {
 namespace util {
 namespace noncopyable_ {
 
-class B10_LIBUTIL_API noncopyable {
+class noncopyable {
 protected:
     noncopyable() {}
     ~noncopyable() {}
diff --git a/win32build/VS/libb10-exceptions/libb10-exceptions.vcxproj b/win32build/VS/libb10-exceptions/libb10-exceptions.vcxproj
index 6fa55dc..6bc9506 100755
--- a/win32build/VS/libb10-exceptions/libb10-exceptions.vcxproj
+++ b/win32build/VS/libb10-exceptions/libb10-exceptions.vcxproj
@@ -92,7 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@ exit /b 0
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -150,7 +150,7 @@ exit /b 0
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -181,7 +181,7 @@ exit /b 0
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4251;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>



More information about the bind10-changes mailing list