hmap: Don't include ovs-atomic.h unnecessarily.

GNU C++ isn't too happy with ovs-atomic.h.  We could fix that (maybe we
should) but the report I received from a C++ user implied to me that it
would be just as useful to just drop the unnecessary #include
"ovs-atomic.h" from hmap.h.

Reported-by: Michael Hu <humichael@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>

diff --git a/lib/cfm.c b/lib/cfm.c
index 380c5b0..6a507a1 100644 (file)
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -29,6 +29,7 @@
 #include "hash.h"
 #include "hmap.h"
 #include "netdev.h"
 #include "hash.h"
 #include "hmap.h"
 #include "netdev.h"

+#include "ovs-atomic.h"

 #include "packets.h"
 #include "poll-loop.h"
 #include "random.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "random.h"

diff --git a/lib/hmap.h b/lib/hmap.h
index 85241f0..dc1e85c 100644 (file)
--- a/lib/hmap.h
+++ b/lib/hmap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2015 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -19,7 +19,6 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
 
 #include <stdbool.h>
 #include <stdlib.h>

-#include "ovs-atomic.h"

 #include "util.h"
 
 #ifdef  __cplusplus
 #include "util.h"
 
 #ifdef  __cplusplus

diff --git a/lib/lacp.c b/lib/lacp.c
index 6535e6d..65149fd 100644 (file)
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
+/* Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -23,6 +23,7 @@
 #include "hash.h"
 #include "hmap.h"
 #include "dp-packet.h"
 #include "hash.h"
 #include "hmap.h"
 #include "dp-packet.h"

+#include "ovs-atomic.h"

 #include "packets.h"
 #include "poll-loop.h"
 #include "seq.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "seq.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 7fb103e..24c91c2 100644 (file)
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2015 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -30,6 +30,7 @@
 #include "odp-util.h"
 #include "ofp-print.h"
 #include "ofpbuf.h"
 #include "odp-util.h"
 #include "ofp-print.h"
 #include "ofpbuf.h"

+#include "ovs-atomic.h"

 #include "packets.h"
 #include "pcap-file.h"
 #include "poll-loop.h"
 #include "packets.h"
 #include "pcap-file.h"
 #include "poll-loop.h"

diff --git a/lib/ovs-lldp.h b/lib/ovs-lldp.h
index 825096b..66288a5 100644 (file)
--- a/lib/ovs-lldp.h
+++ b/lib/ovs-lldp.h
@@ -24,6 +24,7 @@
 #include "hmap.h"
 #include "list.h"
 #include "lldp/lldpd.h"
 #include "hmap.h"
 #include "list.h"
 #include "lldp/lldpd.h"

+#include "ovs-atomic.h"

 #include "packets.h"
 #include "timer.h"
 
 #include "packets.h"
 #include "timer.h"