From f06d06671f80033af214803670e9e597f5320873 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 11 Sep 2012 14:15:54 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8764
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/bond_hybrid.cpp | 2 +-
 src/library.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bond_hybrid.cpp b/src/bond_hybrid.cpp
index 1d853b7fec..f754cead75 100644
--- a/src/bond_hybrid.cpp
+++ b/src/bond_hybrid.cpp
@@ -213,7 +213,7 @@ void BondHybrid::settings(int narg, char **arg)
   while (i < narg) {
     for (m = 0; m < nstyles; m++)
       if (strcmp(arg[i],keywords[m]) == 0)
-        error->all(FLERR,"Bond style hybrid cannot use same pair style twice");
+        error->all(FLERR,"Bond style hybrid cannot use same bond style twice");
     if (strcmp(arg[i],"hybrid") == 0)
       error->all(FLERR,"Bond style hybrid cannot have hybrid as an argument");
     if (strcmp(arg[i],"none") == 0)
diff --git a/src/library.cpp b/src/library.cpp
index da6836dc13..bb6d6cfd64 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -498,11 +498,11 @@ void lammps_scatter_atoms(void *ptr, char *name,
     else array = (int **) vptr;
     int *dptr = (int *) data;
 
-    if (count == 1)
+    if (count == 1) {
       for (i = 0; i < natoms; i++)
         if ((m = lmp->atom->map(i+1)) >= 0)
           vector[m] = dptr[i];
-    else
+    } else {
       for (i = 0; i < natoms; i++)
         if ((m = lmp->atom->map(i+1)) >= 0) {
           offset = count*i;