From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 28 Mar 2020 14:43:57 +0000 (+0100)
Subject: lib/vpsc: rename bcopy->b_copy
X-Git-Tag: stable_release_2.44.0~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce343fcfad39eeaeab8016df260a5bcab141ec24;p=graphviz

lib/vpsc: rename bcopy->b_copy

bcopy is the name of a deprecated function. Compiling on a system
system that still have the function (for example android) gives an
error like:

```
[...]
Making all in vpsc
make[3]: Entering directory '/data/data/com.termux/files/home/projects/graphviz/build/lib/vpsc'
  CXX      blocks.lo
../../../lib/vpsc/blocks.cpp:158:36: error: too few arguments provided to function-like macro invocation
        vector<Block*> bcopy(begin(),end());
                                          ^
/data/data/com.termux/files/usr/include/strings.h:61:9: note: macro 'bcopy' defined here
        ^
1 error generated.
```

Not using bcopy for vector names in block.cpp fixes this.
---

diff --git a/lib/vpsc/blocks.cpp b/lib/vpsc/blocks.cpp
index 7e25ae45c..ee88eb4ae 100644
--- a/lib/vpsc/blocks.cpp
+++ b/lib/vpsc/blocks.cpp
@@ -155,8 +155,8 @@ void Blocks::removeBlock(Block *doomed) {
 	//erase(doomed);
 }
 void Blocks::cleanup() {
-	vector<Block*> bcopy(begin(),end());
-	for(vector<Block*>::iterator i=bcopy.begin();i!=bcopy.end();i++) {
+	vector<Block*> b_copy(begin(),end());
+	for(vector<Block*>::iterator i=b_copy.begin();i!=b_copy.end();i++) {
 		Block *b=*i;
 		if(b->deleted) {
 			erase(b);